Commit Graph
1492 Commits
Author SHA1 Message Date
Mario 71c17a1049 Remove another block of dead code 2017-07-16 20:12:39 +10:00
Mario 3cae977928 Remove some commented out code 2017-07-16 20:03:34 +10:00
Mario adad6a8644 Merge branch 'master' into Mario/texturebrowser_fix 2017-07-16 20:00:45 +10:00
Mario d7bcc7c6da Merge branch 'fixurl' into 'master'
little url fixup

See merge request !52
2017-07-16 08:14:33 +00:00
Mario 62ec92ba22 Merge branch 'export' into 'master'
Name _Export_ option ”Export”

See merge request !54
2017-07-16 08:13:00 +00:00
Thomas Debesse 9e2b92c51d Name _Export_ option ”Export”
It's called “Export” everywhere except in menu!
2017-07-15 15:48:51 +02:00
Mario 07d0b8aa64 Merge branch 'fixpk3' into 'master'
[regression] fix pk3 archive loading [currently broken]

See merge request !49
2017-07-12 20:52:35 +00:00
Thomas Debesse a6011dd66d little url fixup 2017-07-11 13:53:38 +02:00
Thomas Debesse 17ead681d9 fix pk3 archive loading
pk3dir/dpkdir directories were working, not pk3/dpk archives because of
wrong extension comparison.
2017-07-11 13:17:43 +02:00
Mario 95f4573dfe Merge branch 'master' into Mario/texturebrowser_fix 2017-07-11 16:37:38 +10:00
Mario 33c1fb60da Merge branch 'fixurl' into 'master'
Fix menu and about url, remove “check for update” , use xdg-open, enable https

Closes #28 and #87

See merge request !45
2017-07-11 06:29:28 +00:00
Thomas Debesse f22aa5e5da use xdg-open to open url on Linux, fix #87 2017-07-11 05:36:00 +02:00
Thomas Debesse 586f4c520c remove "Check for updates" menu entry, fix #28" 2017-07-11 05:34:28 +02:00
Thomas Debesse ecca2433db Fix menu and about url
- remove dead url and set usable ones instead
- allow to open https:// urls
2017-07-11 05:17:09 +02:00
Mario e0b3d0ac5a Merge branch 'sysfprintf' into 'master'
import sys_fprintf changes by Pan7 from GtkRadiant tree

See merge request !35
2017-07-10 17:13:28 +00:00
Mario 96a933aef3 Merge branch 'dpkdir' into 'master'
add pk3dir and dpkdir support

See merge request !39
2017-07-10 17:12:52 +00:00
Mario d2944c4a5c Merge branch 'unvdeluxe' into 'master'
[q3map2] dæmon engine expects model space deluxe maps

See merge request !40
2017-07-10 17:08:38 +00:00
Mario b9ba9a7bd4 Merge branch 'unvpack' into 'master'
add unvanquished game pack [the real one]

See merge request !41
2017-07-10 17:08:02 +00:00
Mario 887b5a3489 Merge branch 'fixcflags' into 'master'
[cmake] assign CMAKE_CXX_FLAGS as a string instead of a list

See merge request !44
2017-07-10 17:04:11 +00:00
Mario 84a1d9557f Merge branch 'importfixes' into 'master'
[q3map2] import fixes from Thomas Köppe

See merge request !33
2017-07-10 17:03:47 +00:00
Mario 617a0bb788 Merge branch 'libpng16fix' into 'master'
[q3map2] do not copypaste zlib, fix 96

Closes #96

See merge request !42
2017-07-10 13:39:47 +00:00
Thomas Debesse 43379638c4 [cmake] assign CMAKE_CXX_FLAGS as a string instead of a list
- fix command line -DCMAKE_CXX_FLAGS expansion

spotted by !43
2017-07-09 22:06:26 +02:00
Thomas Debesse 3935875f88 do not copypaste zlib
unzip.c contains many bits from an older zlib which mismatches with newer zlib loaded by libpng.
This fix just make unzip.c relying on zlib like libpng does, without copypasting it.

Thanks to `Ishq who figured out the issue.
2017-04-26 02:39:47 +02:00
Thomas Debesse 814b68493f [q3map2] unvanquished expects white minimap 2017-04-23 03:24:27 +02:00
Thomas Debesse 64db002f4c add unvanquished game pack 2017-04-21 00:23:32 +02:00
Thomas Debesse f015089e73 [q3map2] dæmon engine expects model space deluxe maps 2017-04-20 19:30:46 +02:00
Thomas Debesse a0a1965204 do not load tex-* dpk by default, only rely on map DEPS 2017-04-09 14:52:00 +02:00
Thomas Debesse f012273544 introduce dpk / dpkdir support
- do not rely on game name but on new dpk format
  to check for DEPS and versions
- pk3 / pk3dir support is for legacy paks only
- add pk4dir support for free (legacy paks)

replace unvanquished references by daemon ones
in function/variable name for versionned vfs code
2017-04-09 14:52:00 +02:00
Thomas Debesse d555968aca do not crash on missing pak dependency 2017-04-09 14:52:00 +02:00
neumond c99dfa26a5 Add texturebrowser tree updates on vfs restart 2017-04-09 14:52:00 +02:00
neumond 08f880fdc0 load all tex-* paks, remove VFS double start 2017-04-09 14:52:00 +02:00
neumond bbe9ab19c2 unvanquished filesystem 2017-04-09 14:52:00 +02:00
Mario f77b8e43a7 Merge branch 'fix-floodentities' into 'master'
Fix FloodEntities origin-less check

Closes #57

See merge request !38
2017-04-07 04:01:52 +00:00
maek 4f135b96bb Fix FloodEntities origin-less check 2017-03-24 10:15:47 +00:00
Mario cd99e669a3 Merge branch 'matthiaskrgr/no_store_on_no_bnc' into 'master'
q3map2: don't store lightmap if the last bounce computation ran empty.

See merge request !9
xonotic-v0.8.2
2017-03-12 22:47:19 +00:00
Matthias Krüger 72e497d809 q3map2: don't store lightmap if the last bounce computation ran empty. 2017-03-12 22:45:13 +01:00
Mario c39b971caf Merge branch 'master' into Mario/texturebrowser_fix 2017-03-13 05:56:11 +10:00
Mario daa584caa1 Merge branch 'Melanosuchus/fix_build' into 'master'
Fix compilation

See merge request !36
2017-03-12 19:42:42 +00:00
Mattia Basaglia d93ae92b7f Fix compilation 2017-03-12 19:34:42 +00:00
Rudolf Polzer 6aa642ef01 Sorry - nullptr doesn't work with the default Makefile and I don't trust the rest of the code to compile with -std=c++11 yet. 2016-10-19 15:22:12 -04:00
Thomas Debesse d8449157fd More: Using Sys_FPrintf with SYS_WRN and SYS_ERR
This commit do the same as “Using Sys_FPrintf with SYS_WRN and SYS_ERR” commit by @Pan7 (a288b9c) for occurrences that were left untouched (tools/ subtree only).
2016-10-15 20:16:51 +02:00
Pan7 a288b9c436 Using Sys_FPrintf with SYS_WRN and SYS_ERR 2016-10-14 06:01:07 +02:00
Timothee Besset e3f1afe0e8 phrasing.. 2016-10-14 05:57:53 +02:00
Thomas Köppe 1337e610e6 [tools/quake3/q3map2] Fix memset size bugs 2016-10-14 02:40:14 +02:00
Thomas Köppe fed7a21e60 [quake3/q3map2/brush.c] Fix misnamed variable 2016-10-14 02:40:02 +02:00
Thomas Köppe 12e838fba5 [tools/quake3/q3map2/light{,maps}_ydnar.c] Fix float-to-int conversion by preventing NaN values 2016-10-14 02:38:11 +02:00
Thomas Köppe 15d527b42a [quake3/common/aselib.c] Remove unused local variables 2016-10-14 02:26:31 +02:00
Thomas Köppe 0992bd78a0 [quake3/q3map2/brush.c] Fix arithmetic bug 2016-10-14 02:26:22 +02:00
Thomas Köppe b507e1246e [unzip.c{,pp}] Change zc{alloc,free} to internal linkage 2016-10-14 02:22:46 +02:00
Thomas Köppe 7b32a114e1 [regression_tests] Convert line endings to Unix style uniformly 2016-10-14 02:19:34 +02:00