Lwmte
|
0c9922c231
|
Fix corner snapping, replace idiotic pushable data manipulation with less idiotic one
|
2021-11-15 10:38:31 +03:00 |
|
Lwmte
|
3ca6ede394
|
Code styling
|
2021-11-04 05:18:00 +03:00 |
|
Lwmte
|
92d2a7b399
|
Fix sg
|
2021-11-02 02:16:38 +03:00 |
|
Lwmte
|
64f1be7c37
|
Cleanup savegame and sound code
|
2021-10-31 23:55:17 +03:00 |
|
Lwmte
|
8e42d77243
|
Move savegames to separate folder, organize savegame code
|
2021-10-31 21:36:51 +03:00 |
|
Lwmte
|
e786590f84
|
Restore legacy soundtrack masks
|
2021-10-31 11:14:54 +03:00 |
|
Lwmte
|
7701c9e2b7
|
Save playheads in savegame
|
2021-10-29 13:45:48 +03:00 |
|
MontyTRC89
|
2ee369e7ea
|
Added better items handling on load and save for runtime created items
|
2021-10-29 06:49:34 +02:00 |
|
Lwmte
|
cbbb28e388
|
Restore background track on savegame reload
|
2021-10-29 03:39:22 +03:00 |
|
MontyTRC89
|
e5c8c1010e
|
Merge branch 'entities_fixings'
# Conflicts:
# TR5Main/Renderer/Renderer11Draw.cpp
# TR5Main/TombEngine.vcxproj.filters
|
2021-10-28 10:43:09 +02:00 |
|
MontyTRC89
|
4a1e31c467
|
Added sinks, flyby cameras, flipmaps to savegames; Resetted max flipmaps to 256;
|
2021-10-28 06:04:13 +02:00 |
|
MontyTRC89
|
05ba6875f6
|
Fixed some Lara load and save bugs
|
2021-10-19 07:02:32 +02:00 |
|
MontyTRC89
|
e3d1bb18f0
|
Merge remote-tracking branch 'origin/ai_fix' into savegame
# Conflicts:
# TR5Main/Game/savegame.cpp
|
2021-10-17 16:10:06 +02:00 |
|
MontyTRC89
|
9b59d25ca2
|
Added load and save of ropes
|
2021-10-16 07:35:44 +02:00 |
|
Troye
|
9fae662c71
|
reload weaponItem;
|
2021-10-15 17:50:31 -05: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
|
85ab49b31c
|
Fixed Lara loading
|
2021-10-15 06:06:58 +02:00 |
|
MontyTRC89
|
e4966ab976
|
Changed savegames function calls from using strings to slot number
|
2021-10-15 05:35:44 +02:00 |
|
MontyTRC89
|
29d4f54976
|
Added Lara and missing fields; Testing savegames;
|
2021-10-14 17:26:10 +02:00 |
|
MontyTRC89
|
f9d6d56469
|
WIP items serialization
|
2021-10-13 18:36:08 +02:00 |
|
MontyTRC89
|
d2e796d23c
|
Lara serialization
|
2021-10-13 05:43:35 +02: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 |
|
MontyTRC89
|
174183ad20
|
Working on new savegames, first prototype load and save (missing UI)
|
2021-10-11 10:44:28 +02:00 |
|
Lwmte
|
e55ea8033c
|
Cleanup
|
2021-10-10 16:32:50 +03:00 |
|
Raildex
|
1f56879a89
|
Start working on savegame
|
2021-10-07 18:29:16 +02:00 |
|
Raildex
|
4e1dd2fe20
|
made aiTarget a Pointer. EnableBaddieAI spawns a dummy target for use of the AI.
|
2021-10-03 10:07:01 +02:00 |
|
MontyTRC89
|
4b0d76ed95
|
Refactored flame emitters, Lara burn and lightning bolts;
|
2021-09-22 05:51:25 +02:00 |
|
Lwmte
|
cefc60c7ea
|
Move around some files
|
2021-09-19 23:41:26 +03:00 |
|
Lwmte
|
8d86c2e97d
|
Rename draw.cpp to animation.cpp which makes more sense, some more edits
|
2021-09-16 05:06:03 +03:00 |
|
Lwmte
|
68923228dd
|
Remove unused globals and move others from control.cpp to needed source files
|
2021-09-15 21:09:09 +03:00 |
|
Lwmte
|
2e62725933
|
Move flipmap stuff out of control.cpp
|
2021-09-15 17:40:00 +03:00 |
|
Lwmte
|
f79d6436a3
|
Remove optional TestTriggers argument
|
2021-09-15 16:58:53 +03:00 |
|
Lwmte
|
e289644e87
|
Move flipeffect global to filpeffect.cpp
|
2021-09-15 11:38:55 +03:00 |
|
Lwmte
|
eb2f33217c
|
Convert static position to PHD_3DPOS, fix crossbow bolt shatter, read/write proper shatter type
|
2021-09-13 23:15:02 +03:00 |
|
Lwmte
|
a8e128bc0b
|
Rename some legacy fields, restore footsteps
|
2021-09-13 02:07:42 +03:00 |
|
Lwmte
|
744325bea2
|
Revert "Fix regressions"
This reverts commit c1fc33ab52.
|
2021-09-11 10:13:04 +03:00 |
|
Lwmte
|
c1fc33ab52
|
Fix regressions
|
2021-09-11 09:41:29 +03:00 |
|
MontyTRC89
|
8db7df3868
|
Merge branch 'doors_refactoring'
# Conflicts:
# TR5Main/Game/door.cpp
# TR5Main/Game/door.h
# TR5Main/Game/memory/malloc.cpp
# TR5Main/Objects/Generic/Switches/cog_switch.cpp
# TR5Main/Objects/Generic/Switches/crowbar_switch.cpp
# TR5Main/Objects/Generic/Switches/generic_switch.h
# TR5Main/Objects/Generic/Switches/turn_switch.cpp
# TR5Main/Objects/TR4/Object/tr4_obelisk.cpp
# TR5Main/Renderer/Renderer11Draw.cpp
# TR5Main/Specific/level.cpp
# TR5Main/TombEngine.vcxproj
# TR5Main/TombEngine.vcxproj.filters
|
2021-09-11 05:38:26 +02:00 |
|
Lwmte
|
48a9a1d52a
|
Merge branch 'master' into item_data
|
2021-09-09 11:10:25 +03:00 |
|
Lwmte
|
ba6c260b92
|
Further code organizing
|
2021-09-08 18:19:06 +03:00 |
|
Raildex
|
2ee57e5891
|
Renamed "generalPtr" of LaraInfo to "interactedItem"
All code that cast it to ITEM_INFO* was converted to a separate access into g_Level.Items
|
2021-09-05 11:20:51 +02:00 |
|
Raildex
|
b422cafc79
|
Merge branch 'master' into item_data
# Conflicts:
# TR5Main/Game/Lara/lara.cpp
# TR5Main/Game/Lara/lara_collide.cpp
# TR5Main/Game/Lara/lara_monkey.cpp
# TR5Main/Game/Lara/lara_struct.h
# TR5Main/Game/Lara/lara_tests.cpp
# TR5Main/Game/collide.h
# TR5Main/Game/control.h
# TR5Main/Game/effect.h
# TR5Main/Game/effect2.cpp
# TR5Main/Game/flipeffect.cpp
# TR5Main/Game/floordata.h
# TR5Main/Game/hair.cpp
# TR5Main/Game/health.cpp
# TR5Main/Game/items.cpp
# TR5Main/Game/newinv2.cpp
# TR5Main/Game/spotcam.cpp
# TR5Main/Objects/Effects/tr4_bubbles.cpp
# TR5Main/Objects/TR1/Entity/tr1_ape.cpp
# TR5Main/Objects/TR1/Entity/tr1_bigrat.cpp
# TR5Main/Objects/TR1/Entity/tr1_doppelganger.cpp
# TR5Main/Objects/TR2/Entity/tr2_birdmonster.cpp
# TR5Main/Objects/TR2/Entity/tr2_shark.cpp
# TR5Main/Objects/TR2/Entity/tr2_spider.cpp
# TR5Main/Objects/TR2/Entity/tr2_yeti.cpp
# TR5Main/Objects/TR3/Entity/tr3_fishemitter.cpp
# TR5Main/Objects/TR3/Entity/tr3_flamethrower.cpp
# TR5Main/Objects/TR3/Entity/tr3_monkey.cpp
# TR5Main/Objects/TR3/Entity/tr3_raptor.cpp
# TR5Main/Objects/TR3/Entity/tr3_scuba.cpp
# TR5Main/Objects/TR3/Entity/tr3_trex.cpp
# TR5Main/Objects/TR3/Vehicles/kayak.cpp
# TR5Main/Objects/TR3/Vehicles/minecart.cpp
# TR5Main/Objects/TR4/Entity/tr4_bat.cpp
# TR5Main/Objects/TR4/Entity/tr4_big_beetle.cpp
# TR5Main/Objects/TR4/Entity/tr4_bigscorpion.cpp
# TR5Main/Objects/TR4/Entity/tr4_demigod.cpp
# TR5Main/Objects/TR4/Entity/tr4_dog.cpp
# TR5Main/Objects/TR4/Entity/tr4_hammerhead.cpp
# TR5Main/Objects/TR4/Entity/tr4_harpy.cpp
# TR5Main/Objects/TR4/Entity/tr4_mutant.cpp
# TR5Main/Objects/TR4/Entity/tr4_smallscorpion.cpp
# TR5Main/Objects/TR4/Entity/tr4_troops.cpp
# TR5Main/Objects/TR4/Entity/tr4_wildboar.cpp
# TR5Main/Objects/TR4/Trap/tr4_joby_spikes.cpp
# TR5Main/Objects/TR4/Vehicles/motorbike.cpp
# TR5Main/Objects/TR5/Entity/tr5_doberman.cpp
# TR5Main/Objects/TR5/Entity/tr5_imp.cpp
# TR5Main/Objects/TR5/Entity/tr5_larson.cpp
# TR5Main/Objects/TR5/Entity/tr5_lion.cpp
# TR5Main/Objects/TR5/Entity/tr5_reaper.cpp
# TR5Main/Objects/TR5/Object/tr5_pushableblock.cpp
# TR5Main/Objects/TR5/Object/tr5_rollingball.cpp
# TR5Main/Objects/TR5/Trap/tr5_fallingceiling.cpp
# TR5Main/Renderer/Renderer11Draw2D.cpp
# TR5Main/Specific/input.cpp
# TR5Main/Specific/level.cpp
# TR5Main/TombEngine.vcxproj.filters
|
2021-08-31 18:20:23 +02:00 |
|
Raildex
|
44c454318f
|
Cleaned up several buffers to use fixed arrays
Removed game_malloc
TODO: DOOR_DATA destructor crashes
|
2021-08-29 16:35:19 +02:00 |
|
Raildex
|
f7080f56c9
|
Integrated ITEM_DATA into ITEM_INFO
TODO: See what happens with ENEMY_JEEP
|
2021-08-29 16:11:03 +02:00 |
|
Raildex
|
59987a69a7
|
Refactored several info types into separate files
|
2021-08-29 10:19:47 +02:00 |
|
Raildex
|
c6fcf8b248
|
Renamed creature.h to creature_info.h
|
2021-08-29 10:04:49 +02:00 |
|
Lwmte
|
0b7c3d4a20
|
Merge branch 'master' into legacy_trigger_refactor
|
2021-08-28 21:38:58 +03:00 |
|
Raildex
|
dabbeb88db
|
Fixed Include Hell for Creature Info
|
2021-08-28 12:16:03 +02:00 |
|
MontyTRC89
|
d0da243f73
|
Refactored switches
|
2021-08-28 06:37:22 +02:00 |
|
Lwmte
|
1f68fd812b
|
Simplify TestTriggers by providing overloads
|
2021-08-26 12:12:05 +03:00 |
|