]> git.rm.cloudns.org Git - xonotic/netradiant.git/log
xonotic/netradiant.git
6 years agoMerge branch 'importfixes' into 'master'
Mario [Tue, 23 Jan 2018 03:55:09 +0000 (03:55 +0000)]
Merge branch 'importfixes' into 'master'

q3map2: fix pk3dir/dpk/dpkdir code

See merge request xonotic/netradiant!81

6 years agofix pk3dir/dpk/dpkdir code 81/head
Timothee Besset [Mon, 22 Jan 2018 15:03:45 +0000 (09:03 -0600)]
fix pk3dir/dpk/dpkdir code

6 years agoreformat code! now the code is only ugly on the *inside*
TimePath [Sat, 6 Jan 2018 02:56:39 +0000 (13:56 +1100)]
reformat code! now the code is only ugly on the *inside*

6 years agoDisable CMAKE_CXX_EXTENSIONS
TimePath [Sat, 6 Jan 2018 01:36:16 +0000 (12:36 +1100)]
Disable CMAKE_CXX_EXTENSIONS

6 years agoMerge branch 'pakpath' into 'master'
TimePath [Sat, 6 Jan 2018 01:27:22 +0000 (01:27 +0000)]
Merge branch 'pakpath' into 'master'

Add pakpath support to radiant

See merge request xonotic/netradiant!79

6 years agoradiant/q3map2: add option to disable engine path and home path 79/head
Thomas Debesse [Sun, 31 Dec 2017 17:30:47 +0000 (18:30 +0100)]
radiant/q3map2: add option to disable engine path and home path

- add radiant options to not load assets from
  engine path and home path, it helps people to build
  safe development environment
- add -fs_nobasepath and -fs_nohomepath to q3map2
  to do the same
- make radiant pass these options to q3map2

6 years agoradiant: add optional pakpath support
Thomas Debesse [Sun, 31 Dec 2017 16:21:00 +0000 (17:21 +0100)]
radiant: add optional pakpath support

- add optional pakpath support
  currently an hardcoded number of 5 extra pakpath are possible
  this is still better than nothing

- if build profile use [ExtraQ3map2Args] keyword,
  radiant pass the extra pakpaths options to q3map2
  thanks to the -fs_pakpath switch that was added
  in a previous commit

6 years agoFix release mode
TimePath [Wed, 3 Jan 2018 12:09:25 +0000 (23:09 +1100)]
Fix release mode

6 years agoSuppress GTK warnings and errors
TimePath [Wed, 3 Jan 2018 11:45:33 +0000 (22:45 +1100)]
Suppress GTK warnings and errors

6 years agoWrap more GTK
TimePath [Wed, 3 Jan 2018 10:28:05 +0000 (21:28 +1100)]
Wrap more GTK

6 years agoDialog: wrap GTK widgets in data binding develop
TimePath [Wed, 3 Jan 2018 06:24:13 +0000 (17:24 +1100)]
Dialog: wrap GTK widgets in data binding

6 years agoIntroduce Property<T> to simplify preferences system
TimePath [Wed, 3 Jan 2018 02:39:43 +0000 (13:39 +1100)]
Introduce Property<T> to simplify preferences system

6 years agoGroup import/export callbacks
TimePath [Mon, 1 Jan 2018 10:34:55 +0000 (21:34 +1100)]
Group import/export callbacks

6 years agoCallback: cleanup
TimePath [Mon, 1 Jan 2018 05:42:25 +0000 (16:42 +1100)]
Callback: cleanup

6 years agoCallback: remove fixed-arity wrappers
TimePath [Mon, 1 Jan 2018 01:18:56 +0000 (12:18 +1100)]
Callback: remove fixed-arity wrappers

6 years agoCallback: work at any arity
TimePath [Sun, 31 Dec 2017 15:16:35 +0000 (02:16 +1100)]
Callback: work at any arity

6 years agoEmbrace lambdas
TimePath [Sun, 31 Dec 2017 11:06:17 +0000 (22:06 +1100)]
Embrace lambdas

6 years agoSupport lambda callbacks
TimePath [Sun, 31 Dec 2017 10:05:49 +0000 (21:05 +1100)]
Support lambda callbacks

6 years agoEmbrace variadic templates
TimePath [Sun, 31 Dec 2017 05:58:54 +0000 (16:58 +1100)]
Embrace variadic templates

6 years agoCMake: download gamepacks by default again
TimePath [Sat, 30 Dec 2017 10:27:44 +0000 (21:27 +1100)]
CMake: download gamepacks by default again

6 years agoWrap more GTK
TimePath [Sat, 30 Dec 2017 05:56:17 +0000 (16:56 +1100)]
Wrap more GTK

6 years agoGTK: wrap gtk_widget_set_size_request
TimePath [Sat, 30 Dec 2017 04:44:11 +0000 (15:44 +1100)]
GTK: wrap gtk_widget_set_size_request

6 years agoWrap more GTK
TimePath [Sat, 30 Dec 2017 04:34:04 +0000 (15:34 +1100)]
Wrap more GTK

6 years agoWrap more GTK
TimePath [Sat, 30 Dec 2017 04:22:21 +0000 (15:22 +1100)]
Wrap more GTK

6 years agoGTK: wrap gtk_table_attach
TimePath [Sat, 30 Dec 2017 03:36:21 +0000 (14:36 +1100)]
GTK: wrap gtk_table_attach

6 years agoWrap more GTK
TimePath [Fri, 29 Dec 2017 12:55:31 +0000 (23:55 +1100)]
Wrap more GTK

6 years agoGTK: wrap GTK_WIDGET
TimePath [Fri, 29 Dec 2017 11:39:44 +0000 (22:39 +1100)]
GTK: wrap GTK_WIDGET

6 years agoGTK: wrap gtk_widget_show
TimePath [Fri, 29 Dec 2017 10:53:21 +0000 (21:53 +1100)]
GTK: wrap gtk_widget_show

6 years agoGTK: wrap gtk_box_pack_start
TimePath [Fri, 29 Dec 2017 10:44:23 +0000 (21:44 +1100)]
GTK: wrap gtk_box_pack_start

6 years agoWrap more GTK
TimePath [Fri, 29 Dec 2017 09:28:05 +0000 (20:28 +1100)]
Wrap more GTK

6 years agoGTK: wrap gtk_list_store_append
TimePath [Fri, 29 Dec 2017 08:48:00 +0000 (19:48 +1100)]
GTK: wrap gtk_list_store_append

6 years agoRemove nonsense assertions
TimePath [Fri, 29 Dec 2017 08:36:37 +0000 (19:36 +1100)]
Remove nonsense assertions

6 years agoGTK: wrap gtk_list_store_{append,set}
TimePath [Fri, 29 Dec 2017 08:35:56 +0000 (19:35 +1100)]
GTK: wrap gtk_list_store_{append,set}

6 years agoCentralise compile checks
TimePath [Fri, 29 Dec 2017 07:16:48 +0000 (18:16 +1100)]
Centralise compile checks

6 years agoWean off #define
TimePath [Fri, 29 Dec 2017 04:49:57 +0000 (15:49 +1100)]
Wean off #define

6 years agoRemove trailing spaces after `#` tokens
TimePath [Fri, 29 Dec 2017 03:07:15 +0000 (14:07 +1100)]
Remove trailing spaces after `#` tokens

6 years agoMerge branch 'gcc8' into 'master'
TimePath [Fri, 29 Dec 2017 02:57:56 +0000 (02:57 +0000)]
Merge branch 'gcc8' into 'master'

gcc8: static_cast NULL instead of reinterpret_cast

See merge request xonotic/netradiant!74

6 years agoMerge branch 'gamepacks' into 'master'
TimePath [Fri, 29 Dec 2017 02:56:42 +0000 (02:56 +0000)]
Merge branch 'gamepacks' into 'master'

Update game packs, fix some bugs to make them properly installed

See merge request xonotic/netradiant!77

6 years agoMerge branch 'pango_version_check' into 'master'
TimePath [Fri, 29 Dec 2017 02:52:34 +0000 (02:52 +0000)]
Merge branch 'pango_version_check' into 'master'

Fix deprecated pango code always being used in glfont.cpp

See merge request xonotic/netradiant!78

7 years agoFix deprecated pango code always being used in glfont.cpp
Zack Middleton [Sat, 4 Nov 2017 01:00:50 +0000 (20:00 -0500)]
Fix deprecated pango code always being used in glfont.cpp

The version check to see if the non-deprecated API is available,
PANGO_VERSION_CHECK(1,22,0), always returns false if pango-features.h
isn't included. This is because PANGO_VERSION_MAJOR, _MINOR, _MICRO
are not defined and are evaluated as 0 in the preprocessor code.

This commit fixes compiling on Debian 8 using libpango1.0-dev 1.36.8.
It was failing because deprecated function pango_ft2_get_context()
was not available (hidden in header file by PANGO_DISABLE_DEPRECATED).

7 years agofix game_packs_all target
Thomas Debesse [Sat, 14 Oct 2017 02:06:45 +0000 (04:06 +0200)]
fix game_packs_all target

Previously, game_packs_all target was just calling game_packs target, so it
was just installing free game packs, not all. It's now a proper target
setting proper environment variables before calling install-gamepacks.sh.

7 years agodo not look for pack to install in already installed pack
Thomas Debesse [Sat, 14 Oct 2017 02:01:02 +0000 (04:01 +0200)]
do not look for pack to install in already installed pack

Previously, the install-gamepacks.sh script was looking for all
subdirectories in games/ directory for *.games directory to
copy them inside games/ directory.

So, on first run,
it was looking for games/XonoticPack/xonotic.game
to copy it as games/xonotic.game

Then on second run,
it was looking for games/XonoticPack/xonotic.game
and also for games/xonotic.game/xonotic.game
which is silly.

Now the install-gamepacks.sh script is looking for games/*Pack
subdirectories only, it means all gamepacks must end with a
capitalized Pack suffix, which is already the case and is defined
in download-gamepacks.sh after all.

7 years agoupdate game packs list thanks to NeonKnightOA, fix !76
Thomas Debesse [Sat, 14 Oct 2017 01:53:55 +0000 (03:53 +0200)]
update game packs list thanks to NeonKnightOA, fix !76

- update game packs list, thanks to @NeonKnightOA
- add more workarounds for malformed gamepacks from icculus's repository
- obsolete #76

7 years agogcc8: static_cast NULL instead of reinterpret_cast
Thomas Debesse [Wed, 30 Aug 2017 14:45:11 +0000 (14:45 +0000)]
gcc8: static_cast NULL instead of reinterpret_cast

7 years agoRemove RTLD_DEEPBIND, it is no longer required
TimePath [Sun, 13 Aug 2017 10:47:16 +0000 (20:47 +1000)]
Remove RTLD_DEEPBIND, it is no longer required

7 years agoRemove -Wno-sign-compare
TimePath [Mon, 7 Aug 2017 11:51:59 +0000 (21:51 +1000)]
Remove -Wno-sign-compare

7 years agoRemove redefinition of INT_MIN
TimePath [Mon, 7 Aug 2017 09:37:28 +0000 (19:37 +1000)]
Remove redefinition of INT_MIN

7 years agoMissed a R_OK
TimePath [Mon, 7 Aug 2017 09:33:26 +0000 (19:33 +1000)]
Missed a R_OK

7 years agoRemove redefinitions of {F,W,R}_OK
TimePath [Mon, 7 Aug 2017 09:15:34 +0000 (19:15 +1000)]
Remove redefinitions of {F,W,R}_OK

7 years agoRemove -Wno-missing-field-initializers
TimePath [Mon, 7 Aug 2017 08:47:40 +0000 (18:47 +1000)]
Remove -Wno-missing-field-initializers

7 years agoRemove -Wno-incompatible-pointer-types
TimePath [Mon, 7 Aug 2017 08:39:54 +0000 (18:39 +1000)]
Remove -Wno-incompatible-pointer-types

7 years agoRemove -Wno-pointer-to-int-cast
TimePath [Mon, 7 Aug 2017 08:35:22 +0000 (18:35 +1000)]
Remove -Wno-pointer-to-int-cast

7 years agoRemove -Wno-int-conversion
TimePath [Mon, 7 Aug 2017 08:29:13 +0000 (18:29 +1000)]
Remove -Wno-int-conversion

7 years agoRemove -Wno-delete-non-virtual-dtor
TimePath [Sun, 6 Aug 2017 12:03:00 +0000 (22:03 +1000)]
Remove -Wno-delete-non-virtual-dtor

7 years agoUpdate windows build instructions
TimePath [Sun, 6 Aug 2017 11:18:42 +0000 (21:18 +1000)]
Update windows build instructions

7 years agoFix compile
TimePath [Sun, 6 Aug 2017 11:11:56 +0000 (21:11 +1000)]
Fix compile

7 years agoPrevent implicit Widget construction
TimePath [Sun, 6 Aug 2017 11:05:40 +0000 (21:05 +1000)]
Prevent implicit Widget construction

7 years agoRemove -Wno-reorder
TimePath [Sun, 6 Aug 2017 10:08:48 +0000 (20:08 +1000)]
Remove -Wno-reorder

7 years agoRemove -Wno-unused-but-set-variable
TimePath [Sun, 6 Aug 2017 09:24:03 +0000 (19:24 +1000)]
Remove -Wno-unused-but-set-variable

7 years agoReally really fix windows build
TimePath [Sun, 6 Aug 2017 09:07:16 +0000 (19:07 +1000)]
Really really fix windows build

7 years agoReally fix windows build
TimePath [Sun, 6 Aug 2017 08:56:52 +0000 (18:56 +1000)]
Really fix windows build

7 years agoRemove -Wno-write-strings
TimePath [Sun, 6 Aug 2017 08:49:20 +0000 (18:49 +1000)]
Remove -Wno-write-strings

7 years agoRemove -Wno-parentheses
TimePath [Sun, 6 Aug 2017 08:46:18 +0000 (18:46 +1000)]
Remove -Wno-parentheses

7 years agoRemove -Wno-pedantic
TimePath [Sun, 6 Aug 2017 08:41:54 +0000 (18:41 +1000)]
Remove -Wno-pedantic

7 years agoFix windows build
TimePath [Sun, 6 Aug 2017 08:40:08 +0000 (18:40 +1000)]
Fix windows build

7 years agoRemove -Wno-switch
TimePath [Sun, 6 Aug 2017 08:17:25 +0000 (18:17 +1000)]
Remove -Wno-switch

7 years agoRemove -Wno-extra
TimePath [Sun, 6 Aug 2017 08:13:06 +0000 (18:13 +1000)]
Remove -Wno-extra

7 years agoAdd error flags (no changes yet)
TimePath [Sun, 6 Aug 2017 07:59:55 +0000 (17:59 +1000)]
Add error flags (no changes yet)

7 years agoFix prtview about dialog regression
TimePath [Sun, 6 Aug 2017 07:27:10 +0000 (17:27 +1000)]
Fix prtview about dialog regression

7 years agoWrap more GTK
TimePath [Sun, 6 Aug 2017 05:33:28 +0000 (15:33 +1000)]
Wrap more GTK

7 years agoSuppress warnings
TimePath [Sun, 6 Aug 2017 04:19:41 +0000 (14:19 +1000)]
Suppress warnings

7 years agoMerge branch 'smooth' into 'master'
TimePath [Sun, 6 Aug 2017 02:45:22 +0000 (02:45 +0000)]
Merge branch 'smooth' into 'master'

Smoothing stuff

See merge request !70

7 years agoMerge branch 'vfsmodels' into 'master'
TimePath [Sun, 6 Aug 2017 02:43:50 +0000 (02:43 +0000)]
Merge branch 'vfsmodels' into 'master'

refresh VFS on model refresh, refresh models on VFS refresh

See merge request !72

7 years agoMerge branch 'gamepackdeps' into 'master'
TimePath [Sun, 6 Aug 2017 02:42:34 +0000 (02:42 +0000)]
Merge branch 'gamepackdeps' into 'master'

dpk vfs: now loads DEPS file from game pack

See merge request !71

7 years agoMerge branch 'fixwarn' into 'master'
TimePath [Sun, 6 Aug 2017 02:38:06 +0000 (02:38 +0000)]
Merge branch 'fixwarn' into 'master'

Fix some obvious warnings

See merge request !57

7 years agoAdd CPack targets package and package_source
TimePath [Thu, 3 Aug 2017 12:05:12 +0000 (22:05 +1000)]
Add CPack targets package and package_source

7 years agoUpdate CMakeLists.txt
TimePath [Wed, 2 Aug 2017 12:38:07 +0000 (22:38 +1000)]
Update CMakeLists.txt

7 years agorefresh VFS on model refresh, refresh models on VFS refresh 72/head
Thomas Debesse [Tue, 1 Aug 2017 19:13:15 +0000 (21:13 +0200)]
refresh VFS on model refresh, refresh models on VFS refresh

Before:

- refreshing textures were refreshing VFS (to load enabled texture packs)
  but models were not refreshed
- refreshing textures were refreshing models but textures would be missing
  since the VFS was not refreshed and texture packs would be not loaded

After:

- refreshing textures or models both refresh VFS, textures and models,
  this way you don't anymore reload models without refreshing textures, or
  refresh VFS without reloading models, etc.

7 years agodpk vfs: now loads DEPS file from game pack 71/head
Thomas Debesse [Tue, 1 Aug 2017 19:04:58 +0000 (21:04 +0200)]
dpk vfs: now loads DEPS file from game pack

- this way, there is no need to hardcode the loading of
  tex-common or res-buildables to get common textures
  and games buildables models, the game developers just
  have to provide a DEPS file with their game pack, and
  there is no need to enforce the name for this kind of
  stuff

7 years agodeduplicate empty string affectation
Thomas Debesse [Tue, 18 Jul 2017 09:26:44 +0000 (11:26 +0200)]
deduplicate empty string affectation

These the first line is useless, since being overwritten:

g_pStrWork = "";
g_pStrWork = new char[1];
g_pStrWork[0] = '\0';

Also, that first line uselessly raises this warning:

ISO C++ forbids converting a string constant to ‘char*’

7 years agop3dlib.c: include “cmdlib.h” on non Windows platform
Thomas Debesse [Tue, 18 Jul 2017 09:18:03 +0000 (11:18 +0200)]
p3dlib.c: include “cmdlib.h” on non Windows platform

- implicit conditional declaration of function ‘Q_filelength’ and ‘Q_stricmp’
  They come from “cmdlib.h”, so we must conditionally include it too.

7 years agouse %ld instead of %d for “long int” arguments
Thomas Debesse [Tue, 18 Jul 2017 09:12:51 +0000 (11:12 +0200)]
use %ld instead of %d for “long int” arguments

- format ‘%d’ expects argument of type ‘int’, but argument 2 has type ‘long int’
  use ‘%ld’ instead

7 years agouse NULL as sentinel instead of 0
Thomas Debesse [Tue, 18 Jul 2017 08:31:20 +0000 (10:31 +0200)]
use NULL as sentinel instead of 0

- missing sentinel in function call
  Some functions like g_object_set() expect a variable list
  of arguments terminated with NULL sentinel, legacy code
  was using 0 instead.

7 years agosome “char*” to “const char*” declaration
Thomas Debesse [Tue, 18 Jul 2017 08:12:04 +0000 (10:12 +0200)]
some “char*” to “const char*” declaration

- ISO C++ forbids converting a string constant to ‘char*’
 These are obvious fixes when it's better to declare functions
 as expecting “const char*“.

7 years agoone argument, one argument 70/head
Thomas Debesse [Sun, 30 Jul 2017 16:36:49 +0000 (18:36 +0200)]
one argument, one argument

7 years agoIngar was right (slashslash no more)
Thomas Debesse [Sun, 30 Jul 2017 16:35:31 +0000 (18:35 +0200)]
Ingar was right (slashslash no more)

7 years agoMerge branch 'TimePath/gtk++' into 'master'
TimePath [Tue, 1 Aug 2017 10:51:11 +0000 (10:51 +0000)]
Merge branch 'TimePath/gtk++' into 'master'

GTK Upgrade

See merge request !59

7 years agoFix minizip regression
TimePath [Tue, 1 Aug 2017 10:25:13 +0000 (20:25 +1000)]
Fix minizip regression

Closes #107

Useless memcpy wasn't useless...

7 years agoFix legacy makefile 59/head
TimePath [Sun, 30 Jul 2017 11:33:33 +0000 (21:33 +1000)]
Fix legacy makefile

7 years agoRemove a few glib includes in headers
TimePath [Sun, 30 Jul 2017 05:26:07 +0000 (15:26 +1000)]
Remove a few glib includes in headers

7 years agoRemove a few gdk includes in headers
TimePath [Sun, 30 Jul 2017 05:20:04 +0000 (15:20 +1000)]
Remove a few gdk includes in headers

7 years agoRemove the final gtk headers in headers
TimePath [Sun, 30 Jul 2017 05:12:53 +0000 (15:12 +1000)]
Remove the final gtk headers in headers

7 years agoRebase onto master
TimePath [Sun, 30 Jul 2017 05:04:52 +0000 (15:04 +1000)]
Rebase onto master

7 years agos/nullptr/ui::null/ where appropriate
TimePath [Sat, 29 Jul 2017 12:13:23 +0000 (22:13 +1000)]
s/nullptr/ui::null/ where appropriate

7 years agoFix GCC7 issues
TimePath [Sun, 23 Jul 2017 12:10:15 +0000 (22:10 +1000)]
Fix GCC7 issues

7 years agoFix MSYS2 issues
TimePath [Sun, 23 Jul 2017 09:16:45 +0000 (19:16 +1000)]
Fix MSYS2 issues

7 years agoFix GTK3 crash
TimePath [Sun, 23 Jul 2017 08:13:37 +0000 (18:13 +1000)]
Fix GTK3 crash

7 years agoWrap GtkGLArea
TimePath [Sun, 23 Jul 2017 07:34:38 +0000 (17:34 +1000)]
Wrap GtkGLArea

7 years agoUse non-deprecated GDK key constants
TimePath [Sun, 23 Jul 2017 06:32:43 +0000 (16:32 +1000)]
Use non-deprecated GDK key constants

7 years agoWrap g_object_unref
TimePath [Sat, 22 Jul 2017 11:36:30 +0000 (21:36 +1000)]
Wrap g_object_unref