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

236 Commits

Author SHA1 Message Date
Alam Ed Arias 4c635c67a6 Merge remote-tracking branch 'Furyhunter/sdl2' into sdl2 2014-07-23 22:47:12 -04:00
Ronald Kinard 345b59f6f5 sdl2: code cleanup 2014-07-23 21:45:36 -05:00
Alam Ed Arias a103697dd0 isFullscreen is unused? 2014-07-23 22:05:03 -04:00
Alam Ed Arias 1a731fb463 there no fade for non mixer builds 2014-07-23 22:04:46 -04:00
Alam Ed Arias d5c22f9224 Merge remote-tracking branch 'Furyhunter/sdl2' into sdl2 2014-07-23 20:59:34 -04:00
Ronald Kinard 9a4b2bd360 sdl2: restore vsync option (use sdl swap interval) 2014-07-23 19:46:12 -05:00
Ronald Kinard 20f871bd84 sdl2: opengl compiles fine, no TESTHW=1 needed 2014-07-23 19:43:15 -05:00
Ronald Kinard d078e3e17f sdl2: fix opengl (almost) entirely 2014-07-23 19:39:41 -05:00
Alam Ed Arias 6b112a3bfd Merge remote-tracking branch 'wolfy852/next' into next 2014-07-23 18:34:42 -04:00
Alam Ed Arias 331b120c31 Merge remote-tracking branch 'origin/next' into next 
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:32:21 -04:00
Alam Ed Arias 4b446495ad come back to life 2014-07-23 18:29:36 -04:00
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
Ronald Kinard fea559398a sdl2: we have colored rects in gl now I guess 2014-07-22 02:23:51 -05:00
Ronald Kinard 0a37bdf76d sdl2: start getting opengl working again 2014-07-22 01:23:08 -05:00
Ronald Kinard 145618785c sdl2: reuse window on mode change 2014-07-21 22:41:01 -05:00
Ronald Kinard 2618b1dd0b sdl2: truncate resolution list, add 16:9 hdtv modes 2014-07-21 22:16:34 -05:00
Ronald Kinard 1ac1d04cca sdl2: joystick fixes. don't pause in demo play/rec 2014-07-21 21:32:18 -05:00
Alam Ed Arias 35545a0d67 Merge branch 'master' into sdl2 2014-07-21 21:03:34 -04:00
Alam Ed Arias 1c724a6d84 come back to life 2014-07-21 21:00:18 -04:00
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
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