Commit Graph

268 Commits

Author SHA1 Message Date
Alam Ed Arias 5528fa29fe DIE, DIE, DIE 2014-07-21 20:40:03 -04:00
Alam Ed Arias c59cb553e4 DIE, DIE, DIE 2014-07-21 20:39:31 -04:00
Alam Ed Arias 5b2cf41ab8 Merge remote-tracking branch 'origin/master' into sdl2 2014-07-21 18:50:15 -04:00
wolfy852 9ab60d1295 Add LUA_EvalMath to Lua with function name EvalMath 2014-07-19 17:46:53 -05:00
wolfy852 43da4de52f Switch the Linux symbolic links with manual copy-pastes, should fix compiling on Windows for most users. 2014-07-17 20:26:06 -04:00
Alam Arias fcdeb702e9 Merge pull request #18 from wolfy852/next
Switch the Linux symbolic links with manual copy-pastes
2014-07-17 20:18:33 -04:00
wolfy852 eb5b99bc5d Switch the Linux symbolic links with manual copy-pastes, should fix compiling on Windows for most users. 2014-07-17 18:35:27 -05:00
Alam Arias 2c6f83c8c9 Merge pull request #15 from wolfy852/next
Add the Jump Thok ability and water running flag for use by custom characters
2014-07-06 23:07:40 -04:00
wolfy852 d6b466b7dd Add skin flag for running on water 2014-07-05 03:23:49 -05:00
wolfy852 39ce16a468 Add the Jump Thok ability for use by custom characters 2014-07-05 02:50:07 -05:00
Alam Ed Arias c130be77b1 Merge remote-tracking branch 'RedEnchilada/next' into next
Also clean up whitespaces
2014-06-19 13:00:36 -04:00
RedEnchilada 37d3780458 Add hook for chat messages, including csays 2014-06-18 15:28:09 -05:00
Sryder13 aa948b5950 Merge remote-tracking branch 'upstream/master' 2014-05-27 20:44:13 +01:00
Alam Ed Arias b520d61ba2 Merge branch 'master' into sdl2 2014-05-27 15:19:18 -04:00
Alam Ed Arias 15f976a06c Merge branch 'master' into next 2014-05-27 15:19:08 -04:00
Alam Ed Arias b511294749 Merge remote-tracking branch 'Sryder13/master' 2014-05-27 15:14:55 -04:00
Alam Ed Arias 05c3315f68 Merge remote-tracking branch 'wolfy852/next' into next 2014-05-25 23:00:45 -04:00
wolfy852 a8f5406233 Add P_Telekinesis and P_IsFlagAtBase to Lua. 2014-05-25 21:41:05 -05:00
Wolfy 9987d132fb Add P_DoSpring to base library. 2014-05-24 12:51:59 -04:00
Wolfy f509c56e3c Unstatic P_DoSpring. 2014-05-24 12:49:15 -04:00
Wolfy 5316f8da96 Add P_SpawnSpinMobj to base library. 2014-05-24 12:46:46 -04:00
Wolfy 3f1038dcbe Unstatic P_SpawnSpinMobj. 2014-05-24 12:46:10 -04:00
Wolfy ec443af3d9 Add P_SpawnThokMobj to Lua base library.
I don't know too much about this but I THINK I did it right.
2014-05-24 12:35:01 -04:00
Wolfy ed82755b6d Unstatic P_SpawnThokMobj. 2014-05-24 12:30:33 -04:00
ilag d8234f408b Ensures the force shield's movecount is correctly set before comparing 2014-05-15 11:36:17 -07:00
ilag11111 aafc0bcb0d Ensures that the force shield's sprite returns to the proper state after receiving an invincibility monitor.
Fixes http://mb.srb2.org/showthread.php?p=752815
2014-05-14 16:27:37 -07:00
Alam Ed Arias d597856c8f Merge branch 'master' into sdl2 2014-05-02 21:32:31 -04:00
Alam Ed Arias d859b70b25 Merge remote-tracking branch 'ilag11111/robotnikcage' 2014-05-02 21:32:05 -04:00
ilag 1af18c7013 Redo all changes I ended up losing trying to undo the mess I made.
Also, fix the issue pointed out by Alam.
2014-05-02 14:24:20 -07:00
Alam Ed Arias 0f8269fe6f merge sdl interface changes into SDL2 interface 2014-05-02 09:33:57 -04:00
Alam Ed Arias f3bd8c6ef4 Merge branch 'master' into sdl2 2014-05-02 09:01:51 -04:00
Alam Ed Arias ea7abe7c44 Merge branch 'master' of https://github.com/ilag11111/SRB2 2014-05-02 08:49:30 -04:00
Alam Ed Arias 2055e268e8 Merge branch 'cmake' of github.com:AMDmi3/SRB2 2014-05-02 08:49:18 -04:00
Alam Ed Arias 00fc6b9dcd Merge branch 'endianess' of github.com:AMDmi3/SRB2 2014-05-02 08:49:00 -04:00
ilag11111 b21d5c55c9 Uses fixed-point math to properly calculate the exact amount of space needed. 2014-04-25 13:17:05 -07:00
ilag11111 f7bbf8c6d0 Improved fix by changing the formula for how memory is allocated to arbitrary sample rate conversion. 2014-04-25 12:42:43 -07:00
Dmitry Marakasov dad0ad59c1 Add Linux support to CMake 2014-04-25 13:02:50 +04:00
Dmitry Marakasov 3f170769da Add simple CMakeLists.txt 2014-04-25 13:02:50 +04:00
ilag11111 60a115b0a7 Fix (Linux) 64-bit crash in CEZ3 (playback of sfx_litng3). 2014-04-25 00:37:13 -07:00
Dmitry Marakasov 7d52913add Make endianess detection more flexible
And fix it on FreeBSD, where _BIG_ENDIAN is not a flag indicating
big endian machine, but a constant to compare _BYTE_ORDER to.
2014-04-25 02:40:19 +04:00
Sryder13 c5aa433167 Merge remote-tracking branch 'upstream/master' 2014-04-24 15:37:07 +01:00
Alam Ed Arias 5b5fbe9aad fix suport for libpng 1.6 2014-04-21 23:07:02 -04:00
Sryder13 46e84465e8 OpenGL: FOF Cutting Fix 2
Fixes Translucent FOF's cutting Solid FOF's.
2014-04-20 10:35:50 +01:00
Sryder13 a230368c3d Merge remote-tracking branch 'upstream/master' 2014-04-20 10:33:47 +01:00
Alam Ed Arias 26d2d37d31 Merge branch 'master' into sdl2 2014-04-19 13:42:23 -04:00
Alam Ed Arias 8a9759a3e4 SRB2 2.1.8 release 2014-04-19 13:41:29 -04:00
Sryder13 bae7b5b2ac OpenGL: FOF cutting fix
Fixes any FOF's with FF_SOLID not cutting each other.
2014-04-19 17:21:30 +01:00
Sryder13 8271b7feab Merge remote-tracking branch 'upstream/master' 2014-04-19 17:18:14 +01:00
Alam Ed Arias f3e8c01565 Update interfaces I_UpdateMumble function 2014-04-18 11:16:18 -04:00
Alam Ed Arias a4919454e8 Merge branch 'master' into sdl2 2014-04-17 20:46:35 -04:00