Commit graph

459 commits

Author SHA1 Message Date
James Hale
51137837c4 Custom skincolors 2020-02-21 21:56:39 -05:00
Steel Titanium
fc042e90f0 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Steel Titanium
f1204a80aa Merge branch 'next' into the-colors-feel-so-right 2020-02-18 14:29:50 -05:00
Jaime Passos
043057532c Merge remote-tracking branch 'origin/master' into sal-oglshaderport 2020-02-17 12:28:16 -03:00
Steel Titanium
299d8b2772 Merge branch 'next' into the-colors-feel-so-right 2020-02-16 22:56:27 -05:00
fickleheart
51ef6b3684 Merge remote-tracking branch 'upstream/master' into viewroll 2020-02-16 21:32:57 -06:00
Steel Titanium
08533debe6 Add six new skin colors 2020-02-14 22:30:37 -05:00
Monster Iestyn
0a4a879b96 Updated version number to 2.2.1, increment MODVERSION.
Also updated CMakeLists.txt, appveyor.yml and this one Xcode project file as usual
2020-02-05 19:55:40 +00:00
Jaime Passos
9b927e7600 Fix warnings around load_shaders 2020-01-23 22:30:36 -03:00
Sally Cochenour
3b18f17f16 Merge branch 'gl-dropshadows' into oglshaderport 2020-01-17 22:29:31 -05:00
fickleheart
b74ff9eb73 Add DBG_VIEWMORPH to view pre-transformed view 2020-01-17 20:39:15 -06:00
Alam Ed Arias
54c778b18c Merge branch 'master' into next 2020-01-16 20:18:54 -05:00
James R
1de00bc6bb Merge branch 'word' into 'master'
Word jumping

See merge request STJr/SRB2!653
2020-01-16 20:05:12 -05:00
Sally Cochenour
d2cff9ec11 ??
did not commit??
2020-01-16 14:56:11 -05:00
Alam Ed Arias
282abfd4ac Merge branch 'master' into next 2020-01-16 12:08:36 -05:00
Monster Iestyn
7eba91f839 whoops, forgot to do this 2020-01-11 20:24:43 +00:00
Monster Iestyn
9c1b15c986 Don't make locale code dependent on GETTEXT, save that for the actual gettext related stuff! 2020-01-11 18:48:47 +00:00
James R
0f4ef9a354 Put the word jumping code in functions 2020-01-08 12:58:19 -08:00
Sally Cochenour
d2e3c832da Merge next 2020-01-07 07:35:39 -05:00
MascaraSnake
382edce32b Merge branch 'textmap-parser' into 'next'
Textmap parser

See merge request STJr/SRB2!604
2020-01-03 04:14:38 -05:00
James R
67ca512120 Merge remote-tracking branch 'origin/master' into next 2019-12-30 13:16:53 -08:00
James R
0408572380 Merge branch 'modid' into 'next'
Put a mod name in SERVERINFO

See merge request STJr/SRB2!577
2019-12-30 15:41:08 -05:00
James R
14fb5dccc8 Merge branch 'renderswitch' into 'master'
Renderer switching

See merge request STJr/SRB2!550
2019-12-30 15:36:17 -05:00
Nev3r
6e8a023fdd Add basic textmap support; currently crashes when trying to free the virtres, at vres_free(). 2019-12-30 11:33:22 +01:00
Sally Cochenour
31304eda3e Merge branch 'next' into oglshaderport 2019-12-28 13:58:41 -05:00
Alam Ed Arias
2c03fcaac5 Merge branch 'master' into next 2019-12-27 17:08:16 -05:00
Jaime Passos
070adb4191 Merge remote-tracking branch 'origin/next' into rotsprite2 2019-12-26 20:27:29 -03:00
James R
14fed1f644 More fine tuned versioning
You get a PACKETVERSION, for when some packets change format.

You get SRB2APPLICATION, for when you have big fucking mod.
2019-12-25 20:52:02 -08:00
Sally Cochenour
931b44519d Merge next 2019-12-25 14:41:31 -05:00
Sally Cochenour
add2497220 Port of Jimita's shader stuff + my lighting shader
Co-Authored-By: Jaime Passos <jimita@users.noreply.github.com>
2019-12-25 14:22:01 -05:00
Jaime Passos
f55b4bf6ad Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-25 05:43:46 -03:00
James R
7db16e230b Merge branch 'fixsignalhandler' into 'master'
Handle signals correctly on linux

See merge request STJr/SRB2!530
2019-12-24 02:54:44 -05:00
James R
908266f583 symlink latest-log.txt on nix, copy to the real log file everywhere else 2019-12-23 18:20:04 -08:00
Jaime Passos
9916c88baa change ROTANGLES to 72 2019-12-17 13:39:26 -03:00
Jaime Passos
889bbdf96d make ROTANGLES be 360 2019-12-17 13:00:50 -03:00
James R
15ac2982c0 Handle log file in parent properly 2019-12-16 19:28:42 -08:00
James R
e961a901e4 Move everything to i_system.c
This also simplifies things; SDL isn't initialized in the parent process.
2019-12-16 19:27:53 -08:00
James R
c6a882f303 nix: Fork before game code and wait to catch signals and coredumps
Ditched signal_handler to avoid worrying about async-signal-safe functions.
D_QuitNetGame is not called, so players whose programs are interrupted by a
signal will time out from the server. Because the game runs in a child process,
the window can close before the "Signal Caught" text box appears.

"(core dumped)" is also included in the message if core dumping could be
determined.
2019-12-16 19:27:35 -08:00
James R
cbf3c24297 Handle log file in parent properly 2019-12-13 16:51:49 -08:00
James R
5d9cd1c72a Move everything to i_system.c
This also simplifies things; SDL isn't initialized in the parent process.
2019-12-12 15:08:27 -08:00
James R
ff41ba7979 nix: Fork before game code and wait to catch signals and coredumps
Ditched signal_handler to avoid worrying about async-signal-safe functions.
D_QuitNetGame is not called, so players whose programs are interrupted by a
signal will time out from the server. Because the game runs in a child process,
the window can close before the "Signal Caught" text box appears.

"(core dumped)" is also included in the message if core dumping could be
determined.
2019-12-11 23:46:57 -08:00
Jaime Passos
3c9cc53185 Merge remote-tracking branch 'origin/master' into flats-in-walls 2019-12-11 21:53:47 -03:00
Jaime Passos
6976b9bf01 Merge remote-tracking branch 'origin/master' into renderswitch 2019-12-10 23:01:10 -03:00
MascaraSnake
e31a10df30 Change versionstring to 2.2.0 2019-12-06 23:47:05 +01:00
MascaraSnake
3ad7f9e445 Merge branch 'master' into nondevelop 2019-12-06 23:23:01 +01:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
toaster
b36de5f6b5 Make modid 18 to match Rob's work. 2019-12-06 17:23:55 +00:00
toaster
419d696072 Make modversion 40 to match Rob's work. 2019-12-06 17:19:42 +00:00
toaster
67d8b291bb * Fix unintentional order-of-operations crash with non-DEVELOP executables (resolves #461).
* Update md5s.
* Update modversion.

TODO: Should we change MODID, given 2.0 apparently had a different MODID to 2.1?
2019-12-06 17:14:51 +00:00