lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
108 Commits 1 Branch 29 Tags 122 MiB
Commit Graph

108 Commits

Author SHA1 Message Date
Alam Ed Arias 1c4b1c1d7e DIE, DIE, DIE 
Conflicts:
	libs/fmodex/lib/libfmodex64_vc.a
	libs/fmodex/lib/libfmodexL64_vc.a
	libs/fmodex/lib/libfmodexL_vc.a
	libs/fmodex/lib/libfmodex_vc.a
 2014-07-23 18:29:25 -04: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
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 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 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 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 Arias 7fb530fd18 grr, shadows 2014-04-17 17:52:33 -04:00
Alam Ed Arias d6e48e2168 whitespace cleanup 2014-04-17 17:47:51 -04:00
Alam Ed Arias f4b9b11451 Merge remote-tracking branch 'RedEnchilada/master' 2014-04-17 17:46:02 -04:00
RedEnchilada fa79c1856c Make player seethru code account for cut-away view 2014-04-17 13:46:40 -05:00
Alam Ed Arias d7101607a8 Merge remote-tracking branch 'Sryder13/master' 2014-04-17 14:03:44 -04:00
Sryder13 098eb28036 OpenGL Multi-Property FOF's 
Multi-Property FOF's have their multiple side properties display in
OpenGL.
 2014-04-17 13:02:34 +01:00
Sryder13 5b324924ff Undo MD2 Spin Frame Interpolation 
Because apparently people don't like them like that.
 2014-04-17 11:57:10 +01:00
Sryder13 9db0262a90 Merge remote-tracking branch 'upstream/master' 2014-04-17 11:49:03 +01:00
Alam Ed Arias 537ad47d00 Will the real 2.1.7 release please stand up? 2014-04-15 22:20:13 -04:00
Alam Ed Arias 51d8c213f0 Merge remote-tracking branch 'RedEnchilada/master' 2014-04-15 13:57:08 -04:00
RedEnchilada 766f4c4acb Render skybox from proper place for cutaway view 
(Disclaimer: I don't know C at all)
 2014-04-15 12:39:23 -05:00
Alam Ed Arias 8e2378b15d Merge remote-tracking branch 'Sryder13/master' 2014-04-14 09:08:02 -04:00
Sryder13 804684b911 Merge remote-tracking branch 'upstream/master' 2014-04-14 07:34:15 +01:00