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 |
|
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 |
|
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
|
04949b1f75
|
Move */main/object.c -> similar/main/object.c
|
2013-08-07 02:33:18 +00:00 |
|
Kp
|
2c362aae80
|
Move */main/polyobj.c -> similar/main/polyobj.c
|
2013-08-07 02:33:18 +00:00 |
|
zico
|
2b632008b2
|
Cleaned code for homing projectiles a bit and reverted to state of Descent 1 source release; Added ticks to rule target aquisition and adjusted turn rate scaling accordingly
|
2013-08-06 21:04:44 +02:00 |
|
Kp
|
07d6e2c994
|
Fix format mismatch on Win32 newdemo
Win32 makes sizeof(object) an unsigned int instead of unsigned long.
|
2013-08-03 20:32:48 +00:00 |
|
Kp
|
ff90315978
|
Use SConscript configure support to probe for format(printf) attribute
|
2013-07-27 22:17:13 +00:00 |
|
Kp
|
74bcb86cf4
|
Remove some const modifiers that broke SDL-only build
|
2013-07-27 21:29:01 +00:00 |
|
Kp
|
e613b81db6
|
Remove obsolete tmapflat.c
|
2013-07-27 21:08:33 +00:00 |
|
Kp
|
4725ca5f73
|
Move */main/songs.c -> similar/main/songs.c
|
2013-07-24 01:43:02 +00:00 |
|
Kp
|
862d1b561c
|
Move */main/switch.h -> common/main/switch.h
|
2013-07-24 01:43:02 +00:00 |
|
Kp
|
90cd2f4938
|
Move */main/multi.h -> common/main/multi.h
|
2013-07-24 01:43:01 +00:00 |
|
Kp
|
f84884cfa0
|
Move */main/gauges.c -> similar/main/gauges.c
|
2013-07-24 01:27:35 +00:00 |
|
Kp
|
a05793fd84
|
Mark various things static
|
2013-07-23 02:09:12 +00:00 |
|
Kp
|
d55f622691
|
Add missed const for Side_to_verts
|
2013-07-23 02:05:37 +00:00 |
|
Kp
|
1686732c4e
|
Move */main/text.h -> common/main/text.h
|
2013-07-21 22:10:01 +00:00 |
|
Kp
|
f8564907fa
|
Make gauges.c more like D2X
|
2013-07-21 21:55:19 +00:00 |
|
Kp
|
4187648621
|
Remove redundant/obsolete declarations
|
2013-07-21 21:55:00 +00:00 |
|
Kp
|
d0f2d66c89
|
Fix preprocessor guard for draw_outline
|
2013-07-21 21:40:46 +00:00 |
|
Kp
|
5874d7935c
|
Remove unused gauge macros
|
2013-07-21 21:35:21 +00:00 |
|
Kp
|
4577dd3977
|
Merge branch 'd2x-rebirth/master' into unification/master
|
2013-07-21 21:34:46 +00:00 |
|
Kp
|
a1ba420031
|
Mark various parameters and variables as const
|
2013-07-20 23:12:24 +00:00 |
|
Kp
|
9b50efca0e
|
Make local_to_remote and remote_to_local static
|
2013-07-20 17:09:53 +00:00 |
|
Kp
|
a5181a3208
|
Remove unused multi_allow_powerup_mask
|
2013-07-20 16:58:37 +00:00 |
|
Kp
|
6c9c87e27c
|
Move */main/weapon.h -> common/main/weapon.h
|
2013-07-20 16:40:08 +00:00 |
|
Kp
|
012d8e249b
|
Merge branch d1x-rebirth/master into unification/master
|
2013-07-19 22:32:28 +00:00 |
|
Kp
|
e0d8afc8e1
|
Remove d1x-rebirth/editor/meddraw.c
|
2013-06-30 21:22:10 +00:00 |
|
Kp
|
06a2bb4c6b
|
Move */main/aistruct.h -> common/main/aistruct.h
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
a2b7e663df
|
Move */main/weapon.c -> similar/main/weapon.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
88208fc228
|
Merge branch d1x-rebirth/master into unification/master
Conflicts:
SConstruct
d1x-rebirth/main/multi.c
similar/main/cntrlcen.c
similar/main/wall.c
|
2013-06-14 03:18:32 +00:00 |
|
Kp
|
89be67732b
|
Fix powerup_basic warnings after merge
|
2013-06-04 03:12:35 +00:00 |
|
Kp
|
a49aff4897
|
Restore use of Windows icon file
|
2013-06-02 21:46:32 +00:00 |
|
Kp
|
72eacd118b
|
Move */main/ai.h -> common/main/ai.h
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
e0dbe97264
|
Move */main/bm.h -> common/main/bm.h
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
c1b6f8ef8c
|
Move */main/playsave.h -> common/main/playsave.h
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
5d487f4d4d
|
Move */main/state.h -> common/main/state.h
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
020cdecf31
|
Remove d*x-rebirth/main/gamemine.h
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
05a8aaccaf
|
Move */arch/sdl/digi_audio.c -> similar/arch/sdl/digi_audio.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
b09f96b31f
|
Move */arch/sdl/digi.c -> similar/arch/sdl/digi.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
544a07bffa
|
Move */2d/palette.c -> similar/2d/palette.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
61001e1d94
|
Move */2d/pcx.c -> similar/2d/pcx.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
606a455c88
|
Move */2d/font.c -> similar/2d/font.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
8d6698b4e6
|
Move */misc/args.c -> similar/misc/args.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
e18fc92b68
|
Move */main/gamecntl.c -> similar/main/gamecntl.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
c49fb2a68d
|
Move */main/state.c -> similar/main/state.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
9fe359baae
|
Move */main/game.c -> similar/main/game.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
d607792030
|
Move */main/gameseg.c -> similar/main/gameseg.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
fd710386b5
|
Move */main/gamerend.c -> similar/main/gamerend.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
1e0f0c8f1b
|
Move */main/cntrlcen.c -> similar/main/cntrlcen.c
|
2013-03-03 01:03:33 +00:00 |
|