Lwmte
|
7b0c3a732c
|
Cleanup LaraControl and related functions a bit
|
2021-12-14 15:07:04 +03:00 |
|
Sezz
|
899418215b
|
Merge branch 'master' into lara_state_cleaning_etc
|
2021-12-10 12:33:59 +11:00 |
|
Lwmte
|
22f2f03288
|
Fix boat collision, refactor boat a bit
|
2021-12-10 01:27:53 +03:00 |
|
Sezz
|
ea4a2992bd
|
Merge branch 'master' into lara_state_cleaning_etc
|
2021-12-10 09:09:09 +11:00 |
|
Lwmte
|
f520e655aa
|
Use individual block heights for water surface calculation
|
2021-12-09 19:18:29 +03:00 |
|
Sezz
|
cc8d1c79b7
|
Merge branch 'master' into lara_state_cleaning_etc
|
2021-11-28 13:58:46 +11:00 |
|
Lwmte
|
652d0ff2fd
|
Clean up ITEM_INFO
|
2021-11-27 17:50:58 +03:00 |
|
Sezz
|
d85eea8c1f
|
Rename basic state functions; rename some state enum members; rename LG_NO_ARMS to LG_HANDS_FREE; move lara_as_gymnast() to lara_hang.cpp; minor corrections
|
2021-11-25 23:38:59 +11:00 |
|
Lwmte
|
edcf588c22
|
Restore drips
|
2021-11-23 02:53:52 +03:00 |
|
Lwmte
|
9785ae3b04
|
Small fixes
|
2021-11-22 19:14:29 +03:00 |
|
Lwmte
|
e05f0b89a2
|
Rename newinv2 to gui
|
2021-11-16 15:51:50 +03:00 |
|
Lwmte
|
685bf2e4d6
|
Tier 5
|
2021-11-16 15:35:41 +03:00 |
|
Lwmte
|
dedb938b24
|
Tier 1
|
2021-11-16 14:38:04 +03:00 |
|
Lwmte
|
9058f2e3de
|
Use script for setting weather
|
2021-11-11 01:16:27 +03:00 |
|
Lwmte
|
77d66f89db
|
Draw real snow
|
2021-11-10 16:21:41 +03:00 |
|
Lwmte
|
3c92091d01
|
Add transparency and ripples to weather particles
|
2021-11-10 15:31:10 +03:00 |
|
Lwmte
|
a24d8dae37
|
Merge branch 'master' into rain_snow
|
2021-11-10 14:53:31 +03:00 |
|
Sezz
|
b1d68fd58b
|
Refactor lara_tests.cpp
|
2021-11-10 02:01:43 +11:00 |
|
Sezz
|
a653767d71
|
Move various functions out of lara_swim.cpp
|
2021-11-10 01:32:54 +11:00 |
|
Sezz
|
c6be395c90
|
Refactor LaraControl()
|
2021-11-09 16:03:56 +11:00 |
|
Lwmte
|
6aefbd908a
|
Fixes
|
2021-11-08 21:25:52 +03:00 |
|
Lwmte
|
9f0a39d3cb
|
Merge branch 'master' into rain_snow
|
2021-11-08 20:42:38 +03:00 |
|
Lwmte
|
c33e4759c6
|
Swap y/z args in new FD funcs
|
2021-11-08 17:48:57 +03:00 |
|
Lwmte
|
282927ffda
|
Fix #344
|
2021-11-08 17:28:04 +03:00 |
|
Lwmte
|
32355dca9c
|
Test
|
2021-11-08 10:55:12 +03:00 |
|
Lwmte
|
27a9009f33
|
Remove more unused globals, refactor ObjectOnLOS
|
2021-11-04 20:23:26 +03:00 |
|
Lwmte
|
8e42d77243
|
Move savegames to separate folder, organize savegame code
|
2021-10-31 21:36:51 +03:00 |
|
Lwmte
|
83bae04c01
|
Replace logD/logE everywhere with TENLog
|
2021-10-31 10:50:36 +03:00 |
|
Lwmte
|
cbbb28e388
|
Restore background track on savegame reload
|
2021-10-29 03:39:22 +03:00 |
|
Lwmte
|
d470cdcf01
|
Refactor and fix sound code
|
2021-10-29 02:22:26 +03:00 |
|
MontyTRC89
|
e4329c4974
|
Merge branch 'errors'
# Conflicts:
# TR5Main/Game/effects/flmtorch.cpp
# TR5Main/Game/objects.cpp
# TR5Main/Objects/Effects/enemy_missile.cpp
# TR5Main/Objects/TR4/Entity/tr4_demigod.cpp
# TR5Main/Objects/TR4/Entity/tr4_wraith.cpp
|
2021-10-28 11:06:02 +02:00 |
|
Lwmte
|
27c4dee8b2
|
Merge branch 'master' into errors
|
2021-10-28 11:28:24 +03:00 |
|
MontyTRC89
|
bb154867dd
|
Merge branch 'savegame'
|
2021-10-28 07:29:50 +02:00 |
|
Lwmte
|
f592f36a24
|
Merge branch 'master' into errors
|
2021-10-27 19:05:50 +03:00 |
|
MontyTRC89
|
824430d4cf
|
Added safety check for num lights in renderer; Increased rooms and flipmaps to 1024;
|
2021-10-27 08:35:11 +02:00 |
|
Lwmte
|
fb0de37d32
|
Move rumble timer to camera code
|
2021-10-22 16:33:15 +03:00 |
|
MontyTRC89
|
5c829c5c23
|
Renamed little bettes to scarabs; Added statics, cameras, scarabs, spiders, rats, bats to savegames
|
2021-10-15 10:28:32 +02:00 |
|
MontyTRC89
|
e4966ab976
|
Changed savegames function calls from using strings to slot number
|
2021-10-15 05:35:44 +02:00 |
|
MontyTRC89
|
4c3583c1ed
|
Merge remote-tracking branch 'origin/inventory_class' into savegame
# Conflicts:
# TR5Main/Game/savegame.cpp
# TR5Main/Renderer/Renderer11Draw.cpp
# TR5Main/Specific/input.cpp
|
2021-10-15 05:23:04 +02:00 |
|
Troye
|
82c968662e
|
get rid of bitwise menuing
|
2021-10-13 15:10:48 -05:00 |
|
Troye
|
def1169966
|
Implement LoadSave UI; Fix Grenade ammo selection; Fix pause flicker; fix infinite shotgun ammo;
|
2021-10-12 15:05:07 -05:00 |
|
Troye
|
af287cdf6d
|
InventoryClass;
|
2021-10-12 04:15:22 -05:00 |
|
Troye
|
acc4281555
|
purge ring inventory;
|
2021-10-12 00:26:46 -05:00 |
|
MontyTRC89
|
aa5c0821c7
|
Skeleton for load and save GUI; First tests with object api of flat buffer;
|
2021-10-12 06:43:25 +02:00 |
|
Lwmte
|
ef0bcf950a
|
Merge branch 'master' into errors
|
2021-10-08 16:47:59 +03:00 |
|
Lwmte
|
30cea4bf15
|
Implement two-pass ledge angle check for tight diagonal setups
|
2021-10-08 13:58:51 +03:00 |
|
Lwmte
|
daf23132c9
|
Cleanup control.cpp
|
2021-10-04 03:14:05 +03:00 |
|
Lwmte
|
b46e0466c3
|
Cleanup smoke particles on level load, add some logging to level load
|
2021-10-04 03:09:32 +03:00 |
|
Lwmte
|
c871884301
|
Don't use legacy function names in sound code
|
2021-10-02 18:54:53 +03:00 |
|
Lwmte
|
401666b8cd
|
Fix PAD/ANTIPAD triggers
|
2021-10-01 18:31:06 +03:00 |
|