Jaime Passos
1002c47407
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-17 16:12:44 -03:00
Jaime Passos
740f095219
Merge remote-tracking branch 'sonicteamjuniorheadquarters/master' into gl_gifs
2019-12-12 01:39:46 -03:00
Jaime Passos
6976b9bf01
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-10 23:01:10 -03:00
Steel Titanium
a5cdb0a4b3
Update copyright date on source files
2019-12-06 13:49:42 -05:00
Alam Ed Arias
c1b29fb1a1
Merge branch 'public_next' into private
2019-12-05 11:18:33 -05:00
Alam Ed Arias
2982082dbf
Fix building with MSVC
2019-12-05 10:51:55 -05:00
Steel Titanium
25712d9500
No longer allow showhud to toggle FPS counter or ping bar
2019-11-23 16:09:02 -05:00
Jaime Passos
3ed8470b58
remove unused levelwipes
2019-11-18 19:22:46 -03:00
Jaime Passos
925940b44e
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-18 18:48:19 -03:00
Steel Titanium
b1f39e836d
Better ping implementation.
2019-11-17 20:22:47 -05:00
Jaime Passos
4acdb54d87
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-12 20:36:06 -03:00
Jaime Passos
845b82668b
Merge remote-tracking branch 'origin/master' into renderswitch
2019-11-12 20:25:40 -03:00
Jaime Passos
c2aab97d10
fix conflict
2019-11-12 00:23:26 +01:00
Jaime Passos
e32238f0b5
GIF recording
2019-11-10 00:21:48 -03:00
toaster
2a16cf539a
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into internal-md3-vanilla-c
...
Merge seems fine, but won't compile for some reason.
2019-11-02 18:34:12 +00:00
Jaime Passos
76a5b60e39
Merge remote-tracking branch 'origin/master' into f_wipes
2019-10-28 23:14:00 -03:00
MascaraSnake
f5f21db2f4
Merge branch 'window-focus-music' into 'master'
...
Window focus options for playing sounds/music
See merge request STJr/SRB2Internal!407
2019-10-25 15:37:06 -04:00
James R
cd1ad44539
Console variables to toggle music/sound playing when the window is unfocused
...
Playsoundsifunfocused and playmusicifunfocused. "No" by default.
2019-10-23 17:21:09 -07:00
James R
57d6baac56
Revert sound and music window focus related toggles
...
This partially reverts commit 96a12b6bed
2019-10-23 15:24:34 -07:00
James R
30c5b66d64
Toggle ping and FPS counters with HUD
2019-10-22 21:50:51 -07:00
James R
96a12b6bed
Miscellaneous window de-focus options
...
Music pausing is now optional.
Sounds may be paused--on by default.
The game itself being paused in off-line mode is now optional.
(showfocuslost now loads from config.)
2019-10-22 21:15:20 -07:00
James R
3970085d5d
Grab mouse on window focus
...
Window focus does not necessarily imply mouse movement.
2019-10-22 19:45:43 -07:00
Jaime Passos
09c9714daf
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c
2019-10-06 17:40:41 -03:00
TehRealSalt
ca83b06d93
Fuckhuge restructuring
...
- m_menu.c and m_menu.h are dead. Everything has now been moved to k_menudef.c, k_menufunc.c, k_menudraw.c, and k_menu.h.
- Expanded menu_t and menuitem_t to add transitions and tooltips
- Early character select screen
- Removed almost all menu definitions, I'll be reimporting them as they are needed
2019-10-02 11:31:11 -04:00
Jaime Passos
e95bd8add3
Merge remote-tracking branch 'origin/master' into renderswitch
2019-09-27 22:53:57 -03:00
Jaime Passos
fa9cef1cc0
Merge remote-tracking branch 'origin/master' into openglskydome2
2019-09-27 22:47:10 -03:00
Steel Titanium
a18872652f
Merge branch 'master' into internal-hotplug-stableid
2019-09-23 00:44:34 -04:00
Jaime Passos
5e1ebad9d3
sky barreling
2019-09-17 23:38:04 -03:00
Alam Ed Arias
aab58a4613
Revert "Merge branch 'gl_skydome' into 'master'"
...
This reverts merge request !326
2019-09-17 20:20:09 +00:00
Jaime Passos
0d11dd516a
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c
2019-09-15 16:24:24 -03:00
Steel Titanium
5ba4e604b2
Merge branch 'newicon' into 'master'
...
New EXE icon
See merge request STJr/SRB2Internal!265
2019-09-12 14:05:32 -04:00
Jaime Passos
ce8b821691
Merge remote-tracking branch 'jimita/renderswitch' into renderswitch
2019-09-10 18:12:01 -03:00
Jaime Passos
53568ba62f
Better fades
2019-09-09 23:31:48 -03:00
Jaime Passos
93ea8c4019
can i push this already?
2019-09-08 22:25:18 -03:00
Jaime Passos
11077c2bac
still making things better
2019-09-08 21:37:24 -03:00
Jaime Passos
61a16d43f5
more stuff. i hope i didnt mess this up.
2019-09-08 18:59:49 -03:00
Jaime Passos
1cb22d5e6b
initial stuff
2019-09-08 18:44:40 -03:00
Jaime Passos
398b320aec
initial stuff
2019-09-08 18:27:35 -03:00
Steel Titanium
0b5bc8f64f
Merge branch 'master' into internal-hotplug-stableid
...
Just merged in known working code, note that I haven't tested it, so I have no idea if it compiles still.
2019-09-08 01:55:36 -04:00
Jaime Passos
6573e94e3a
PRBoom sky dome
2019-09-03 02:12:17 -03:00
James R
de8030bc2e
Toggle ping and FPS counters with HUD
2019-08-11 12:32:57 -07:00
mazmazz
4ac4034eb9
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b
2019-08-04 21:33:13 -04:00
toaster
534b98251b
Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'""
...
This reverts commit a76668f55a
2019-08-04 12:03:57 +01:00
toaster
a76668f55a
Revert "Merge branch 'musicplus-aug2019-b' into 'master'"
...
This reverts commit 0f89fb123f8fb211d8cf
2019-08-04 11:32:55 +01:00
Steel Titanium
2cccab7655
More icon stuff
2019-07-27 01:13:54 -04:00
mazmazz
7bbd05e85d
Merge branch 'public-notpublic-musicplus-jingle' into internal-musicplus-jingle
2019-06-29 18:33:45 -04:00
mazmazz
53fe455a8f
Merge branch 'public-musicplus-jingle' into public-notpublic-musicplus-jingle
2019-06-29 18:10:44 -04:00
mazmazz
14df513db6
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla
2019-06-29 17:51:30 -04:00
mazmazz
11955ba838
Merge remote-tracking branch 'public-gl/master' into md3-vanilla
2019-06-29 15:02:07 -04:00
Latapostrophe
a35cea9243
chaos conflict
2019-06-11 17:02:47 +02:00
