Daniel Evans
ddb62ed3cd
Rewrite of camera and character look code
...
Make states responsible for interpolating camera transformation
Apply look direction to character orientation
2016-12-04 01:06:27 +00:00
Daniel Evans
04e79a5117
Merge pull request #254 from danhedron/texture-slots
...
Load textures into separate groups
2016-12-04 01:04:53 +00:00
Daniel Evans
c00145e551
Reduce code duplication for DFF texture lookup
2016-12-03 21:59:37 +00:00
Daniel Evans
d75c476221
Remove global texture list and use a slot name to lookup textures
2016-12-03 21:59:37 +00:00
Daniel Evans
6ca849dd8f
Drop alpha name from TextureArchive lookup
2016-12-03 21:59:37 +00:00
Daniel Evans
15427b8f99
Add texture lookup callback to LoaderDFF
2016-12-03 21:59:37 +00:00
Daniel Evans
0abfc680a8
Merge pull request #253 from danhedron/remove-async
...
Remove WorkContext
2016-12-02 20:48:50 +00:00
Daniel Evans
8d10c80196
Remove all traces of WorkContext
2016-12-02 01:00:22 +00:00
Daniel Evans
b65a513bbb
Remove usages of WorkContext
2016-12-02 00:56:38 +00:00
Daniel Evans
7ad8ae5e40
Make loadTXD synchronous only
2016-12-02 00:42:38 +00:00
Daniel Evans
6ef99c0de9
Fix crash starting new game
...
The player doesn't always exist, so we do need to check..
2016-11-24 21:30:43 +00:00
Daniel Evans
c63d12b70a
Merge pull request #250 from JohnPaulHarold/openal_headers
...
OpenAL headers, fix for OSX compile
2016-11-22 21:00:49 +00:00
John-Paul Harold
9a1d1033e7
Fix OpenAL includes (fixes OSX build)
2016-11-21 11:19:29 +00:00
Daniel Evans
d0e01465ff
Merge pull request #248 from danhedron/input-fixup
...
Input fixup
2016-11-20 00:15:08 +00:00
Daniel Evans
9c8690bfae
Fix Control enum order which was causing excessive aliasing
2016-11-19 23:50:34 +00:00
Daniel Evans
f0e0e6e747
Extract game input state handling from IngameState
...
Prevents input getting "stuck" when input is removed in the pause menu
2016-11-19 23:50:34 +00:00
Daniel Evans
40f18dabb0
zero all input when player input is disabled
2016-11-19 23:50:34 +00:00
Daniel Evans
57edc3648b
Detect event starts by double-buffering state
2016-11-19 23:50:34 +00:00
Daniel Evans
d9e85dbc9f
Merge pull request #247 from JayFoxRox/bullet-fix-285
...
Fixup BT_BULLET_VERSION check
2016-11-10 23:20:25 +00:00
Jannik Vogel
d5ff5601be
Fixup BT_BULLET_VERSION check
...
Bullet 2.83.5 was 283, 2.83.6 was 284, 2.84 (API changes affecting OpenRW) was 285, 2.85.1 is still 285.
We want to check for 2.84 and upwards, so our check must be for 285.
2016-11-07 22:38:38 +01:00
Daniel Evans
9f2fb5aa19
Merge pull request #245 from danhedron/physics-cleanup-1
...
Physics cleanup
2016-11-04 20:41:30 +00:00
Daniel Evans
6ce9ecedcc
Rewrite collision model data assignment
2016-11-03 23:26:09 +00:00
Daniel Evans
ca5649b840
Rewrite LoaderCOL and CollisionModel
2016-11-03 23:25:57 +00:00
Daniel Evans
0b0d82fdc4
Merge pull request #246 from JayFoxRox/bullet-284
...
Adapt for Bullet >= 2.84
2016-10-29 12:34:15 +01:00
Jannik Vogel
10c4f6dc86
Adapt for Bullet >= 2.84
2016-10-29 01:02:07 +02:00
Daniel Evans
3c83e7cf52
Merge pull request #244 from danhedron/game-cleanup-1
...
General Game cleanup
2016-10-24 22:15:10 +01:00
Daniel Evans
684e32f4a9
Simplify Script system by removing SCMOpcodes
...
This was just a useless container for a set of modules. We only have
one module now so don't bother with it. This means we can remove some
more raw new & deletes from RWGame too.
2016-10-24 21:29:41 +01:00
Daniel Evans
fb4d9ea8c3
Use unique_ptr for GameWorld instance
2016-10-24 21:29:41 +01:00
Daniel Evans
81c27da97b
Make GameState instance a direct member of RWGame
2016-10-24 21:29:41 +01:00
Daniel Evans
32352baedd
Remove very dead debug code
2016-10-24 21:29:41 +01:00
Daniel Evans
d62e8a6cd2
Make MenuEntry height a property of the Menu
2016-10-24 21:29:41 +01:00
Daniel Evans
613d386488
Improve Menu system implementation
2016-10-24 21:29:41 +01:00
Daniel Evans
6a7802de87
Overhaul State and StateManager to remove pointers
...
Removed raw State pointers in favour of unique_ptrs
Avoid allowing control flow to re-enter States that have exited
Defer releasing states until the end of the frame
2016-10-24 21:29:40 +01:00
Daniel Evans
b4aa01e4bb
Use C++14
2016-10-24 21:26:51 +01:00
Daniel Evans
c54273bb63
Correct RWGame.hpp header guard
2016-10-19 22:34:51 +01:00
Daniel Evans
ad998e8a80
Avoid allocating RWGame members where possible
...
These objects don't need to be dynamically allocated, they can
take on the same lifetime as RWGame itself.
2016-10-19 22:34:51 +01:00
Daniel Evans
2f118631dc
Move some non-game code into GameBase class
...
This moves window setup and configuration loading into a base
class so that RWGame can focus on game related matters
2016-10-19 22:34:51 +01:00
Daniel Evans
657a726a9b
Initialise logging outside of RWGame
2016-10-19 22:34:51 +01:00
Daniel Evans
6da5dc6dae
Merge pull request #243 from danhedron/item-cleanup-1
...
Remove InventoryItem and WeaponItem
2016-10-19 22:34:28 +01:00
Daniel Evans
5c78930c1b
Remove InventoryItem and WeaponItem
...
They served no purpose other than to awkwardly implement weapon firing
This is now handled in the Weapon::fire* functions, and everything else
has been changed to reference weapon data or inventory indices directly
2016-10-19 22:14:52 +01:00
Daniel Evans
44f73af9e9
Merge pull request #242 from danhedron/debug-views-1
...
Improve Debug Views
2016-10-13 23:28:30 +01:00
Daniel Evans
13f504d699
Draw nearby object state in object debug view
2016-10-13 22:31:26 +01:00
Daniel Evans
fe0d2f92b0
Initial objects debug view
2016-10-13 22:31:26 +01:00
Daniel Evans
c4a34da36a
Simplify debug stats text
2016-10-13 22:31:26 +01:00
Daniel Evans
baca296436
Remove useless information from debug stats
2016-10-13 22:31:26 +01:00
Daniel Evans
40d27b4a07
Clean up debug view selection code
2016-10-13 22:31:26 +01:00
Daniel Evans
02efff6f8f
Merge pull request #241 from danhedron/new-object-data
...
Correct object data storage
2016-10-10 20:51:25 +01:00
Daniel Evans
e31c30efe9
Improve loading of hard-coded models
2016-10-10 20:49:44 +01:00
Daniel Evans
a861309936
Change special and cutscene logic to load and unload models
2016-10-07 01:04:48 +01:00
Daniel Evans
17315c7974
Make the test vehicle list explicit
...
The object order is no longer sorted, so we have to specify exactly
which vehicles to spawn in the test mode
2016-10-05 22:38:35 +01:00
