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 |
|
Kp
|
997c35c351
|
Move */include/loadgl.h -> common/include/loadgl.h
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
306ab24486
|
Merge branch 'd1x-rebirth/master' into unification/master
|
2013-06-02 20:13:38 +00:00 |
|
Kp
|
410b07d5c4
|
Merge branch 'd1x-rebirth/master' into unification/master
Conflicts:
SConstruct
|
2013-05-05 22:08:34 +00:00 |
|
Kp
|
dbec5197f6
|
Move */main/vers_id.c -> similar/main/vers_id.c
|
2013-05-05 17:39:03 +00:00 |
|
Kp
|
616a3a6b70
|
Merge branch d1x-rebirth into unification/master
Conflicts:
SConstruct
common/main/cntrlcen.h
common/main/fuelcen.h
common/main/fvi.h
common/main/gameseq.h
common/main/gauges.h
common/main/multibot.h
common/main/net_udp.h
common/main/object.h
common/main/player.h
common/main/vers_id.h
d1x-rebirth/main/hostage.c
d1x-rebirth/main/multi.c
main/controls.c
main/hostage.h
main/laser.h
main/screens.h
similar/arch/ogl/gr.c
similar/editor/centers.c
similar/main/inferno.c
similar/main/lighting.c
similar/main/multibot.c
similar/main/paging.c
similar/main/physics.c
similar/main/player.c
similar/main/robot.c
similar/main/wall.c
|
2013-04-21 04:51:35 +00:00 |
|
Kp
|
ff96f3239d
|
Move */main/controls.c -> similar/main/controls.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
86f373e4e0
|
Move */main/multibot.c -> similar/main/multibot.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
691b95a02c
|
Move */main/physics.c -> similar/main/physics.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
0138d330b3
|
Move */main/inferno.c -> similar/main/inferno.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
4bf4710aff
|
Move */main/menu.h -> common/main/menu.h
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
dab72f3127
|
Move */main/robot.c -> similar/main/robot.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
4b18dcbff9
|
Move */main/text.c -> similar/main/text.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
8d379f4f9c
|
Move */3d/interp.c -> similar/3d/interp.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
d2e3ed0228
|
Move */main/wall.c -> similar/main/wall.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
c1f9bcbf64
|
Move */main/cntrlcen.h -> common/main/cntrlcen.h
Also, adjust includes in source files that assumed cntrlcen.h would
include switch.h.
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
ccbb392fd4
|
Move */main/lighting.c -> similar/main/lighting.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
e1c6fd9690
|
Move */main/config.c -> similar/main/config.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
0952484183
|
Move part of */main/hostage.c -> similar/main/hostage.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
6ddc31fc33
|
Move */main/hostage.h -> common/main/hostage.h
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
acbe1209e8
|
Move */arch/sdl/digi_mixer.c -> similar/arch/sdl/digi_mixer.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
2679c2be10
|
Move */editor/texpage.c -> similar/editor/texpage.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
a27d667716
|
Move */editor/medrobot.c -> similar/editor/medrobot.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
8263b74663
|
Move */editor/centers.c -> similar/editor/centers.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
3e93f2d707
|
Move */main/gauges.h -> common/main/gauges.h
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
40c71caf92
|
Move */main/credits.c -> similar/main/credits.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
a622ccf07f
|
Move */main/player.c -> similar/main/player.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
ed814d313e
|
Move */main/multibot.h -> common/main/multibot.h
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
a42e743694
|
Move */main/effects.c -> similar/main/effects.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
828452910a
|
Move */main/digiobj.c -> similar/main/digiobj.c
|
2013-03-03 01:03:33 +00:00 |
|
Kp
|
d2b9accbf0
|
Move */main/wall.h -> common/main/wall.h
|
2013-03-03 01:03:33 +00:00 |
|