Kp
|
b7dac2941c
|
Move */main/gamesave.c -> similar/main/gamesave.c
|
2013-09-01 22:59:55 +00:00 |
|
|
Kp
|
ce2dd25e3f
|
Use helper for setting menu items to types menu and text
|
2013-09-01 22:24:13 +00:00 |
|
|
Kp
|
bf027e3df0
|
Move */main/titles.c -> similar/main/titles.c
|
2013-09-01 22:19:27 +00:00 |
|
|
Kp
|
17037caa4d
|
Mark titles.c briefings static const
|
2013-09-01 21:52:34 +00:00 |
|
|
Kp
|
801dfbcd81
|
Move */main/net_udp.c -> similar/main/net_udp.c
|
2013-09-01 21:51:54 +00:00 |
|
|
Kp
|
ccb92fdefa
|
Use macro to define advanced net UDP options
|
2013-09-01 21:11:27 +00:00 |
|
|
Kp
|
9d2d8bb552
|
Scrub netgame flags on load/save/send/recv
|
2013-09-01 21:09:01 +00:00 |
|
|
Kp
|
923c2111de
|
Move */main/switch.c -> similar/main/switch.c
|
2013-09-01 18:42:31 +00:00 |
|
|
Kp
|
25b7735e44
|
Move */main/aipath.c -> similar/main/aipath.c
|
2013-09-01 18:38:37 +00:00 |
|
|
Kp
|
3554d17614
|
Move */main/render.c -> similar/main/render.c
|
2013-09-01 18:22:55 +00:00 |
|
|
Kp
|
f131fcd3da
|
Move */main/menu.c -> similar/main/menu.c
|
2013-09-01 18:06:24 +00:00 |
|
|
Kp
|
1fd1aa05bc
|
Move */main/mission.c -> similar/main/mission.c
|
2013-09-01 17:43:27 +00:00 |
|
|
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
|
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
|
897023eda5
|
Reorder vertex render lookups to simplify merge
|
2013-08-24 17:10:06 +00:00 |
|
|
Kp
|
3f0f68e862
|
Remove unused move_object_to_goal
|
2013-08-24 16:54:28 +00:00 |
|
|
Kp
|
e8776caf16
|
Remove unused get_random_child
|
2013-08-24 16:54:28 +00:00 |
|
|
Kp
|
0365b3600f
|
Remove unused special_object_in_seg
|
2013-08-24 16:54:28 +00:00 |
|
|
Kp
|
335c56111b
|
Remove unused move_object_to_legal_spot
|
2013-08-24 16:54:28 +00:00 |
|
|
Kp
|
b1b40bfe99
|
Remove unused set_rotvel_and_saturate
|
2013-08-24 16:54:28 +00:00 |
|
|
Kp
|
1b44fe5844
|
Move alpha blend test to helper to simplify merge
|
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
|
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
|
d55054d82e
|
Always play a sound when a player escapes the mine
|
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
|
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
|
de6422d58f
|
Remove unused multi_send_audio_taunt
|
2013-08-11 20:43:08 +00:00 |
|
|
Kp
|
6e88008677
|
Use unaligned-safe copy of powerup position
|
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
|
91928c2afc
|
Rename 'new' to 'n' for C++ compatibility
|
2013-08-11 20:43:08 +00:00 |
|
|
Kp
|
85dc42189b
|
Add extent to RankStrings to match D2X
|
2013-08-11 15:11: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
|
01f155382e
|
Removed chaff ability from D1X-Rebirth's proxys as they were never intended to do that
|
2013-08-09 17:29:10 +02: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
|
319b3ec5fd
|
Mark more math as const correct
|
2013-08-09 03:04:18 +00:00 |
|