Commit graph

729 commits

Author SHA1 Message Date
Jaime Passos
53568ba62f Better fades 2019-09-09 23:31:48 -03:00
Alam Ed Arias
8a69d97a12 Be clear on what FALLTHRU we really want 2019-09-09 15:02:13 -04: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
Steel Titanium
e1b14d3d7d Fix function being redefined 2019-09-08 19:39:23 -04: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
Steel Titanium
414bff33bf Better directory structure 2019-09-08 01:29:09 -04:00
Jaime Passos
6573e94e3a PRBoom sky dome 2019-09-03 02:12:17 -03:00
Jaime Passos
24d08edf05 Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b 2019-09-02 20:27:50 -03:00
Monster Iestyn
0b6a463cff Merge branch 'public_next'
# Conflicts:
#	src/config.h.in
#	src/d_clisrv.c
#	src/d_netcmd.c
#	src/doomdef.h
#	src/p_map.c
#	src/p_maputl.c
#	src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
2019-08-20 13:54:48 +01:00
Monster Iestyn
a20079e410 Update version to 2.1.25 2019-08-16 20:14:01 +01:00
Alam Ed Arias
01020ae65f Merge branch 'public_next' into private 2019-08-08 23:41:19 -04:00
Alam Ed Arias
5c0912bab1 Tested to be compile with Mingw64 9.1.0 2019-08-08 21:25:46 -04:00
mazmazz
0d38d7087b Use strtok instead of strtok_r 2019-08-07 01:29:05 -04:00
mazmazz
4ac4034eb9 Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b 2019-08-04 21:33:13 -04:00
toaster
b928c5fc98 Revert "Revert "Fix MIDI Soundfont code shadowing a global variable.""
This reverts commit d880a02fa1.
2019-08-04 12:04:01 +01: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 0f89fb123f, reversing
changes made to 8fb211d8cf.
2019-08-04 11:32:55 +01:00
toaster
d880a02fa1 Revert "Fix MIDI Soundfont code shadowing a global variable."
This reverts commit 8a1b36322d.
2019-08-04 11:28:04 +01:00
toaster
8a1b36322d Fix MIDI Soundfont code shadowing a global variable. 2019-08-04 10:28:10 +01:00
mazmazz
12e86aaa44 Merge branch 'internal-musicplus-jingle' into musicplus-aug2019 2019-08-04 02:41:37 -04:00
mazmazz
753ea04fe3 Mixer X menu touchup 2019-08-04 02:30:34 -04:00
mazmazz
8ab76b50c6 Merge remote-tracking branch 'origin/master' into musicplus-sdlmixerx 2019-08-04 01:10:21 -04:00
mazmazz
ae05d8c0dd Merge remote-tracking branch 'origin/master' into internal-musicplus-jingle 2019-08-03 23:38:49 -04:00
Alam Ed Arias
cc977161e6 SDL2: more consts 2019-07-29 19:22:14 -04:00
Alam Ed Arias
9e6c358a5b SDL2: more const in xpm code 2019-07-29 19:08:55 -04:00
Alam Ed Arias
827bd7e123 Merge remote-tracking branch 'private/master' into newicon 2019-07-29 19:04:19 -04:00
Alam Ed Arias
5286938853 Fix building with MSVC 2019-07-29 19:02:45 -04:00
Alam Ed Arias
644aba78d5 Merge branch 'public_next' into private 2019-07-29 18:31:01 -04:00
Alam Ed Arias
62e45e5f5b SDL2: fixed compiling mixer interface with MSVC 2019-07-29 17:56:35 -04:00
Steel Titanium
2778068921 Change it back to const char 2019-07-28 18:19:00 -04:00
Steel Titanium
1624338f10 Update mac icon 2019-07-28 17:06:01 -04:00
Steel Titanium
2cccab7655 More icon stuff 2019-07-27 01:13:54 -04:00
Steel Titanium
e6332f97d8 Fix crash with GME sounds when being freed 2019-07-27 01:13:54 -04:00
Steel Titanium
490e3fe9a9 Merge branch 'master' into musicplus-sdlmixerx 2019-07-22 22:20:08 -04:00
Steel Titanium
d44702cb0e Some fixup 2019-07-22 22:01:05 -04:00
Steel Titanium
1d5f417a86 Let's not use this 2019-07-16 19:26:16 -04:00
Steel Titanium
93acb98aa7 New icons
Also update IMG_xpm.c
2019-07-16 19:20:00 -04:00
Monster Iestyn
f266eda97b Merge branch 'public_next' 2019-07-16 18:28:49 +01:00
Steel Titanium
db525c43a7 Fix crash with GME sounds when being freed 2019-07-14 14:55:04 -04:00
Monster Iestyn
3fec42c436 Add static keyword to these variables for correctness 2019-07-14 16:23:01 +01:00
Steel Titanium
c0927754a1 Seperate declarations from code 2019-07-09 15:51:11 -04:00
Steel Titanium
ccecb4c6cd Some few comments 2019-07-09 00:56:22 -04:00
Steel Titanium
2b3118b288 Better loading code for modules 2019-06-29 20:35:31 -04:00
mazmazz
f7936876be Merge branch 'master' into musicplus-sdlmixerx 2019-06-29 19:31:01 -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