TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
4054 commits 2 branches 28 tags 122 MiB
Commit graph

367 commits

Author SHA1 Message Date
Kp 24bbd2a76d Move */main/automap.c -> similar/main/automap.c 2013-09-01 17:37:38 +00:00
Kp 7bf5b29be4 Move */main/kconfig.c -> similar/main/kconfig.c 2013-09-01 17:20:07 +00:00
Kp 8ddcf5c0fc Mark titles.c functions static 2013-08-31 17:17:35 +00:00
Kp e23035e61f Move Last_afterburner_time into laser_info 2013-08-31 17:17:35 +00:00
Kp 051e346186 Restructure menu.c for merging 2013-08-31 17:17:35 +00:00
Kp 31b9ad0bde Restructure misc options menu for merging 2013-08-31 17:17:34 +00:00
Kp 567b1d13c2 Remove broken COMPACT_SEGS code 
It has not built since at least 0c36fecb.
 2013-08-31 16:45:43 +00:00
Kp 1abcfcb844 Add sanity check that DiskBitmapHeader is the right size 
This would have caught the -mms-bitfields bug at build time.
 2013-08-25 17:16:41 +00:00
Kp af52e78a50 Move similar/arch/ogl/ogl.c -> similar/arch/ogl/ogl.cpp 2013-08-24 17:10:35 +00:00
Kp 897023eda5 Reorder vertex render lookups to simplify merge 2013-08-24 17:10:06 +00:00
Kp 1b44fe5844 Move alpha blend test to helper to simplify merge 2013-08-24 16:44:30 +00:00
Kp 828ced10a5 Declare newdemo_count_demos for D2 menu system 2013-08-24 16:44:30 +00:00
Kp afcbfe8e54 Rename d1x/d2x variables to unify names between D1X and D2X 2013-08-24 16:44:30 +00:00
Kp 045082f3eb Use static const fix Flash_rate 2013-08-20 03:02:30 +00:00
Kp 00381b2652 Abstract out weapon names 2013-08-20 02:59:09 +00:00
Kp 9c0be7cdfa Remove unused kconfig globals 2013-08-20 02:58:51 +00:00
Kp 948e03dcbf Copy mission parameters properly so that D1 missions load 
Copying unrelated structures with an undocumented assumption that one is
a prefix of the other is dangerous and broken.  Remove it and copy the
relevant fields explicitly.
 2013-08-18 21:05:31 +00:00
Kp a04cd57d71 Move */main/multi.c -> similar/main/multi.c 2013-08-11 23:46:13 +00:00
Kp e86a9b67a6 Move multi.c variables to top of file 2013-08-11 23:03:40 +00:00
Kp ad6a7820cf Make PowerupAdjustMapping static const 2013-08-11 22:42:51 +00:00
Kp 82dc40c891 Remove unused prototypes 2013-08-11 20:46:53 +00:00
Kp 69b3618961 Make vm_angvec_zero a static inline function 2013-08-11 20:46:53 +00:00
Kp 6b4ca09376 Split out anarchy object deletion predicate to simplify merge 2013-08-11 20:46:52 +00:00
Kp 743dd2f964 Rearrange code to simplify merge with D1X 2013-08-11 20:46:52 +00:00
Kp 836aa10f8c Use macro PUT_WEAPON_FLAGS to hide differences in D1X vs D2X 
D2X uses a bigger field due to added weapons, but the idea is the same
in both games.
 2013-08-11 20:46:52 +00:00
Kp 431282fd7b Remove redundant Game_mode guard on multi_strip_robots 2013-08-11 20:46:52 +00:00
Kp 8d13642c9f Hide GM_CAPTURE tests behind static inline 2013-08-11 20:46:52 +00:00
Kp 0c3adc48df Hide GM_HOARD tests behind static inline 2013-08-11 20:46:52 +00:00
Kp 202755e8e3 Use macro GET_WEAPON_FLAGS to hide differences in D1X vs D2X 
D2X uses a bigger field due to added weapons, but the idea is the same
in both games.
 2013-08-11 20:46:52 +00:00
Kp 5ef0358a4b Remove unnecessary int casts in multi buffer parsing 2013-08-11 20:46:52 +00:00
Kp 3226a57848 Remove unused MULTI_ACTIVE_DOOR 2013-08-11 20:43:08 +00:00
Kp de6422d58f Remove unused multi_send_audio_taunt 2013-08-11 20:43:08 +00:00
Kp 760667eb60 Remove unused multi_set_robot_ai 2013-08-11 20:43:08 +00:00
Kp 7042815795 Remove OLDPOWCAP code 2013-08-10 23:01:28 +00:00
Kp bca0dacc98 Merge branch d2x-rebirth/master into unification/master 
Conflicts:
	SConstruct
 2013-08-09 22:53:45 +00:00
Kp 33aa8937d9 Merge branch d1x-rebirth/master into unification/master 
Conflicts:
	SConstruct
	common/main/multi.h
	similar/main/gamerend.c
 2013-08-09 22:49:04 +00:00
zico 830bcd7845 merge with ccea6b3547 2013-08-09 17:25:42 +02:00
zico a527348681 Added MULTI_FIRE_BOMB as alteration of MULTI_FIRE to keep bombs mapped in a Multiplayer match for later Host authority and to make their chaff ability work correctly. Additionally added MULTI_FIRE_TRACK to only send Network_laser_track if > -1. On the way I made laser.c a bit more similar between D1X and D2X 2013-08-09 17:21:03 +02:00
Kp 2cc0068fa9 Move */main/fvi.c -> similar/main/fvi.c 2013-08-09 03:13:33 +00:00
Kp 275883ab4f Remove unnecessary Error calls in FVI code 2013-08-09 03:04:18 +00:00
Kp 319b3ec5fd Mark more math as const correct 2013-08-09 03:04:18 +00:00
Kp ccea6b3547 Remove unused multi functions 2013-08-09 02:10:51 +00:00
Kp 2cd7748e93 Convert vsprintf to vsnprintf 2013-08-09 01:58:17 +00:00
zico 40c5f10e20 Added definition of DESIGNATED_GAME_FPS as 30 and DESIGNATED_GAME_FRAMETIME based on the former. We use those for d_tick_count intervals and to scale other parts that have never been properly aligned to FrameTime before. In that regard, Release builds will take DESIGNATED_GAME_FPS as MINIMUM_FPS for -maxfps argument 2013-08-08 22:07:29 +02:00
Kp a881ee455e Remove fix.h 2013-08-08 03:01:48 +00:00
Kp f11d7f6423 Simplify setup of thief/buddy messages 2013-08-08 03:01:47 +00:00
Kp b624684ba5 Switch gr_printf(x,y,"%s",s) to gr_string(x,y,s) 2013-08-08 03:01:47 +00:00
zico bbaa3c21f3 HAMERS! Wait 33ms between each turn of a homing missile projectile, only scale turns if FPS are below 30 2013-08-08 00:29:56 +02:00
Kp 9c982bbbc5 Remove unused function door_is_wall_switched 2013-08-07 02:33:20 +00:00
Kp b35fceee21 Remove unused function net_udp_get_player_name 2013-08-07 02:33:20 +00:00