Alam Ed Arias
57a7a3bed8
Merge branch 'master' into next
2017-12-17 22:22:57 -05:00
MonsterIestyn
47a06ffda5
Merge pull request #218 from LJSonik/resynch-fixes
...
Resynch fixes
2017-12-17 21:57:25 +00:00
LJSonik
9c7ff6e0c3
Merge branch 'master' into resynch-fixes
2017-12-17 22:47:23 +01:00
Alam Ed Arias
baf227175b
Merge branch 'master' into next
2017-12-16 18:16:15 -05:00
Alam Arias
703c5322d4
Merge pull request #212 from SteelTitanium/window_center_fix
...
Fix for window being offcenter
2017-12-16 18:15:00 -05:00
Alam Ed Arias
bd86f98822
Merge branch 'master' into next
2017-12-16 16:07:31 -05:00
MonsterIestyn
2ad4e1a1e5
Merge pull request #219 from LJSonik/net-archive-fix
...
Fix missing lua_pop in ArchiveExtVars
2017-12-16 20:57:46 +00:00
Louis-Antoine
4ea5d2df01
Merge branch 'net-archive-fix' of https://github.com/LJSonik/SRB2 into net-archive-fix
2017-12-15 22:06:03 +01:00
Louis-Antoine
beb9b0f103
Return for both players and mobjs if they've got an empty table, instead of just mobjs
2017-12-15 22:02:34 +01:00
LJSonik
b994180927
Merge branch 'master' into net-archive-fix
2017-12-15 20:07:44 +01:00
Louis-Antoine
0b836a9841
Fix missing lua_pop in ArchiveExtVars
2017-12-15 16:31:27 +01:00
Louis-Antoine
4e89c03b0f
Node and player isn't the same thing !#^&*%^:'\[[^!#^$4&@(é@*(&$*@#à$%@
2017-12-12 23:08:18 +01:00
Louis-Antoine
16b8265c6e
F stands for Fun. You want more Fun, don't you?
2017-12-12 22:48:08 +01:00
Steel
dbbbc1cc06
Merge branch 'master' into window_center_fix
2017-11-08 00:32:23 -05:00
Monster Iestyn
d61105fcce
Merge branch 'master' into next
2017-11-01 18:36:48 +00:00
Monster Iestyn
b63bd97b1a
Merge branch 'md2-interpolation-fix' into 'master'
...
MD2 interpolation fix
Closes #28
See merge request STJr/SRB2!212
2017-11-01 13:34:34 -04:00
Monster Iestyn
2b1fb67a5f
DrawMD2i: change duration and tics to INT32, fix up any related code
2017-10-30 19:12:51 +00:00
Steel Titanium
799a819ee9
Merge remote-tracking branch 'upstream/master' into window_center_fix
2017-10-29 00:00:11 -04:00
Alam Ed Arias
6a639dd717
Merge branch 'master' into md2-interpolation-fix
2017-10-28 18:47:20 -04:00
Alam Ed Arias
d2f922a981
Merge branch 'master' into next
2017-10-28 18:46:10 -04:00
Alam Ed Arias
cf10b55be0
Win32: pragma hell
2017-10-28 18:39:42 -04:00
Alam Ed Arias
3ecc304332
Win32: just ignore format overflows
2017-10-28 18:33:47 -04:00
Alam Ed Arias
0250040a5b
Win32: all fails of DD and try more to stop format-overflow errors
2017-10-28 18:24:07 -04:00
Alam Ed Arias
a4072260db
Win32: try to fix up CD printf code
2017-10-28 18:13:59 -04:00
Alam Ed Arias
365879d06f
libs: Updated SDL2-Mixer to 2.0.2
2017-10-28 18:03:18 -04:00
Alam Ed Arias
e1492ae3f0
libs: EOL fun of SDL2
2017-10-28 17:53:15 -04:00
Alam Ed Arias
b7d0896c83
libs: updated SDL2 to 2.0.7
2017-10-28 17:50:36 -04:00
Alam Ed Arias
daf442f17b
Appvendor: -Wno-error=suggest-attribute=noreturn
2017-10-27 21:31:02 -04:00
Alam Ed Arias
f6af81be59
Appvendor: -Wno-tautological-compare
2017-10-27 21:25:52 -04:00
Alam Ed Arias
264fc2f3c7
Appveyor: remove error
2017-10-27 21:14:52 -04:00
Alam Ed Arias
c160241f1b
Appveyor: stuff warnings switchs
2017-10-27 20:59:18 -04:00
Alam Ed Arias
bdfdd868c7
Appveyor: let see what is the command line
2017-10-27 20:30:15 -04:00
Alam Ed Arias
ce40c00b7a
Build: do not error on FALLTHURs
2017-10-27 19:49:55 -04:00
Monster Iestyn
365cd305d7
Make appveyor config use GCC72=1 instead of GCC63=1
2017-10-27 17:41:23 +01:00
Monster Iestyn
0cc8fbdb4e
Don't use interpolation code if the frame lasts instantaneously or infinitely
...
Also removed the + 1 from newtime, since there was never really any need for it. It just offset the interpolation so it went like (1 -> 2] instead of [1 -> 2), so you never saw the base appearance for each frame except at the end of any frames interpolating to it
Changed DrawMD2Ex's duration/tics type to INT32 so -1 comparisons work, probably want to change the signs elsewhere too but this is fine for now
2017-10-24 20:45:55 +01:00
Alam Ed Arias
96c014deeb
Merge branch 'master' into next
2017-10-07 12:44:28 -04:00
Alam Ed Arias
1b576bacf3
Build: support GCC 8
2017-09-30 23:07:47 -04:00
Alam Ed Arias
6fbdf37b18
Build: support building with clang 5.0
2017-09-30 08:54:17 -04:00
Alam Ed Arias
075c4e0956
Travis: clang 4.0 and 5.0 is not up for trusy
2017-09-29 17:57:03 -04:00
Alam Ed Arias
472c74907e
Travis: fix misspelling
2017-09-29 17:52:12 -04:00
Alam Ed Arias
03ba14640f
Travis: test building with clang 3.9, 4.0 and 5.0
2017-09-29 17:43:20 -04:00
Monster Iestyn
ea372fae53
Merge branch 'master' into next
2017-09-29 17:15:57 +01:00
Monster Iestyn
c90ddbca36
Merge branch 'makefile-ports-tweaks-cleanup-etc' into 'master'
...
Makefile ports tweaks cleanup etc
See merge request !211
2017-09-28 17:31:33 -04:00
Alam Ed Arias
6c18d15b4a
Merge branch 'master' into next
2017-09-28 16:55:04 -04:00
Alam Ed Arias
01602fa1f1
Build: fixup warnings in Debug builds
2017-09-28 16:54:26 -04:00
Alam Ed Arias
16b3f65660
Merge branch 'master' into next
2017-09-28 16:28:22 -04:00
Alam Ed Arias
92aa0e000e
Travis: can not use set version with sdl2
2017-09-28 16:24:22 -04:00
Alam Ed Arias
1ab0697fee
Merge branch 'master' into next
2017-09-28 16:09:07 -04:00
Alam Ed Arias
a356beac2c
Travis: install SDL2 2.0.6 and SDL2_Mixer 2.0.1
2017-09-28 15:31:34 -04:00
Alam Ed Arias
0eafaafca1
Travis: drop sdl2_mixer from MacPorts and use SDL 2.0.6
2017-09-28 13:49:57 -04:00