James R
|
407b00b22b
|
Merge branch 'showconditionset' into 'next'
Showconditionset
See merge request STJr/SRB2!651
|
2020-01-10 15:59:37 -05:00 |
|
James R
|
2491046bc2
|
Merge branch 'morehints' into 'next'
Allow for 10 emblem hints on a map by poking the drawer a bit.
See merge request STJr/SRB2!650
|
2020-01-10 15:59:22 -05:00 |
|
James R
|
7deb18bdc9
|
Merge remote-tracking branch 'origin/master' into next
|
2020-01-08 13:27:14 -08:00 |
|
toaster
|
377194b077
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into showconditionset
# Conflicts:
# src/m_menu.c
|
2020-01-08 20:00:50 +00:00 |
|
toaster
|
d2da441a57
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into morehints
# Conflicts:
# src/m_menu.c
|
2020-01-08 19:18:35 +00:00 |
|
fickleheart
|
c133e645f7
|
Merge remote-tracking branch 'upstream/next' into next-newcontrols
|
2020-01-07 23:43:43 -06:00 |
|
Steel Titanium
|
808d731652
|
Update copyright statements for changed names
|
2020-01-06 17:16:27 -05:00 |
|
Alam Ed Arias
|
5b93230a94
|
Merge branch 'master' into next
|
2020-01-06 10:28:21 -05:00 |
|
Alam Ed Arias
|
0fbc459243
|
cleanup whitespace
|
2020-01-05 21:49:07 -05:00 |
|
James R
|
e4f88d142e
|
Merge branch 'connect-ip-textbox' into 'master'
Add clipboard functionality to the Connect via IP textbox.
See merge request STJr/SRB2!597
|
2020-01-05 17:06:45 -05:00 |
|
fickleheart
|
f8a3e3b898
|
Merge remote-tracking branch 'origin/next' into next-newcontrols
|
2020-01-04 09:57:09 -06:00 |
|
fickleheart
|
f0e6a56b6b
|
Merge branch 'newcontrols' into next-newcontrols
|
2020-01-04 09:56:24 -06:00 |
|
fickleheart
|
794d74c4d7
|
Merge remote-tracking branch 'origin/master' into newcontrols
|
2020-01-04 09:35:12 -06:00 |
|
Alam Ed Arias
|
a26c5f5428
|
Merge branch 'master' into next
|
2020-01-03 14:56:37 -05:00 |
|
LJ Sonic
|
c6aec51d99
|
Merge branch 'ungrab-mouse-in-menus' into 'master'
Let the mouse move freely when a menu is open or game is paused
See merge request STJr/SRB2!617
|
2020-01-02 18:48:38 -05:00 |
|
Louis-Antoine
|
3af00ac93e
|
Minor code refactoring
|
2020-01-02 00:47:20 +01:00 |
|
Louis-Antoine
|
5bde4df439
|
Grab mouse again when closing menu, unpausing, etc
|
2020-01-02 00:45:28 +01:00 |
|
James R
|
0c40a466d8
|
Merge remote-tracking branch 'origin/master' into next
|
2020-01-01 15:39:05 -08:00 |
|
James R
|
85fbf4f571
|
Merge branch 'custom-gametype-serverinfo' into 'next'
Gametype name in SERVERINFO
See merge request STJr/SRB2!610
|
2020-01-01 17:52:46 -05:00 |
|
fickleheart
|
b22de48c03
|
Merge branch 'next' into next-newcontrols
# Conflicts:
# src/g_game.c
# src/p_setup.c
|
2019-12-31 12:58:36 -06:00 |
|
James R
|
b4ebb01e2d
|
Truncate gametype name in server list if it's too long
|
2019-12-30 22:23:19 -08:00 |
|
James R
|
281f30c4fd
|
Replace gametype with gametypename in SERVERINFO
PACKETVERSION 1
|
2019-12-30 22:18:55 -08:00 |
|
James R
|
7af2533d23
|
Make the menu option for renderer switching transparent under NOHW
|
2019-12-30 21:45:19 -08:00 |
|
James R
|
38492073fa
|
IT_PAIR for when you want to define both sides of a menu item
|
2019-12-30 21:40:13 -08:00 |
|
Jaime Passos
|
181a366d4a
|
Merge remote-tracking branch 'origin/next' into respawndelaygametyperule
|
2019-12-30 18:39:31 -03:00 |
|
fickleheart
|
2c45ecbaa5
|
Fix camera reset button
|
2019-12-30 15:34:43 -06:00 |
|
James R
|
fc8c0f8a9a
|
Merge remote-tracking branch 'origin/master' into next
|
2019-12-30 13:16:53 -08:00 |
|
fickleheart
|
a51f2500e0
|
Update playstyle menu handling to use analog/directionchar combo
|
2019-12-30 15:15:37 -06:00 |
|
James R
|
5e5f3c4fa7
|
Merge branch 'renderswitch' into 'master'
Renderer switching
See merge request STJr/SRB2!550
|
2019-12-30 15:36:17 -05:00 |
|
fickleheart
|
e0f35d207f
|
Convert analog/directionchar cvars into 2-long arrays
|
2019-12-30 14:01:14 -06:00 |
|
fickleheart
|
085c39128f
|
Save separate camera settings for standard/simple modes
|
2019-12-30 12:10:38 -06:00 |
|
fickleheart
|
a9b80bf1f0
|
Merge branch 'master' into newcontrols
# Conflicts:
# src/d_netcmd.c
# src/g_game.c
# src/g_game.h
# src/m_menu.c
|
2019-12-30 10:47:09 -06:00 |
|
James R
|
7886a4bbee
|
Don't warn if we start in OpenGL
|
2019-12-29 18:37:44 -08:00 |
|
James R
|
569453ee93
|
Warn when going to OpenGL from the menu
|
2019-12-29 18:37:22 -08:00 |
|
GoldenTails
|
bc88def225
|
Slap in some Ctrl+Insert (copy) support too while I'm at it.
Also added a comment but you didn't see that.
|
2019-12-29 20:22:58 -06:00 |
|
GoldenTails
|
9d701d722e
|
Reverted to better, less complex system, and added support for Shift+Insert and Shift+Delete.
Major thanks to James for helping me.
Turns out that strncpy thwarts the memory leaks for me. Silly, me!
|
2019-12-29 20:15:18 -06:00 |
|
GoldenTails
|
ae9adce873
|
Replace magic numbers with less magic and more readable chars.
|
2019-12-29 18:26:56 -06:00 |
|
Jaime Passos
|
5c023739e6
|
change this > to >=
|
2019-12-27 12:23:50 -03:00 |
|
Jaime Passos
|
eca5be52b2
|
And the sound test
|
2019-12-26 23:52:42 -03:00 |
|
Jaime Passos
|
956905c8f4
|
Same deal, but for the level platter and save select screen
|
2019-12-26 23:49:31 -03:00 |
|
Jaime Passos
|
644e41d90c
|
Handle character select screen correctly after a renderer switch
|
2019-12-26 23:39:40 -03:00 |
|
Jaime Passos
|
e617f35182
|
PU_PATCH funny
|
2019-12-26 23:26:43 -03:00 |
|
James R
|
1dac3d174e
|
Merge remote-tracking branch 'origin/master' into next
|
2019-12-26 15:35:53 -08:00 |
|
James R
|
414a066ec8
|
Merge branch 'turnmultiplier' into 'master'
Option to increase the turning speed
See merge request STJr/SRB2!553
|
2019-12-26 18:18:23 -05:00 |
|
Jaime Passos
|
03a3b02301
|
Merge remote-tracking branch 'origin/master' into renderswitch
|
2019-12-25 05:43:46 -03:00 |
|
Jaime Passos
|
3622829504
|
Merge remote-tracking branch 'aaaaaaaa/next' into gametype-clownery
|
2019-12-24 17:55:46 -03:00 |
|
James R
|
3f339384c8
|
Merge branch 'hwrtexfix' into 'master'
Fix model texture blending
See merge request STJr/SRB2!546
|
2019-12-24 14:44:19 -05:00 |
|
GoldenTails
|
1f93ab0e0f
|
Optimise further, play beep on cut/copy, play beep when paste is successful.
|
2019-12-23 18:53:41 -06:00 |
|
Jaime Passos
|
61b72203a8
|
Merge remote-tracking branch 'origin/master' into gametype-clownery
|
2019-12-23 18:21:13 -03:00 |
|
James R
|
3e2b28e162
|
Merge remote-tracking branch 'origin/master' into turnmultiplier
|
2019-12-22 21:26:36 -08:00 |
|