Jace
5e721325a4
Merge fixes
2016-01-14 18:20:51 +01:00
Jace
627108c6ee
Fixes for #30
...
# Conflicts:
# src/Game/Game.cpp
2016-01-14 18:15:38 +01:00
Jace
3a4f378ac5
Merge remote-tracking branch 'origin/master' into PlayerMovement
...
# Conflicts:
# src/Game/Game.cpp
2016-01-14 17:07:39 +01:00
Jace
6ad1839def
Initial work on PlayerMovementSystem
2016-01-14 17:03:48 +01:00
a8f7d5f6b9
Merge pull request #30 from teamfisk/Rendering
...
Rendering Scenes
2016-01-14 16:43:35 +01:00
71047b08ec
Async load works, using exceptions for special resources.
2016-01-14 16:27:45 +01:00
b80ecc29d8
Added comments and cleaned up in Game.cpp/h
2016-01-14 15:32:53 +01:00
773a417a90
Merge branch 'master' into Sound
2016-01-14 14:19:48 +01:00
cca64dca24
Refactoring and commenting.
2016-01-14 13:54:38 +01:00
9f185a1e35
Wrecked the last commit. Async loading works now.
2016-01-13 18:51:45 +01:00
59be714fdc
1 Component added: CapturePoint
...
1 System added: CapturePointSystem
1 Test added: CapturePointTest
added 1 variable in PlayerComponent (TeamNumber)
added 2 variables in CapturePoint (CaptureTimer,OwnedBy)
CapturePointSystem is now handling 2 events: OnTriggerTouch,OnTriggerLeave
Added the CapturePointSystem to Game.cpp
2016-01-13 15:58:52 +01:00
Jace
d6ef527f25
Basic collisions using Octree. Seems buggy over octree boundaries.
2016-01-13 15:34:43 +01:00
a58cc33ed0
WIP, multithreaded loading based on exceptions, very slow probably.
2016-01-13 10:58:31 +01:00
0f17f9a888
Merge remote-tracking branch 'origin/master' into Rendering
...
# Conflicts:
# include/Engine/Editor/EditorSystem.h
# include/Engine/Rendering/EPicking.h
# include/Engine/Rendering/Renderer.h
# include/Game/Game.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/Test.xml
# src/Engine/Editor/EditorSystem.cpp
# src/Engine/Rendering/RawModel.cpp
# src/Engine/Rendering/RenderQueueFactory.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
2016-01-12 16:13:20 +01:00
729ebe6c8b
Merge remote-tracking branch 'origin/master' into Sound
...
# Conflicts:
# README.md
# resources/Schema/Components.xsd
# resources/Schema/Types/Entity.xsd
2016-01-12 14:50:10 +01:00
56ac592d6d
Removed debug code from Game.cpp
2016-01-12 14:16:01 +01:00
976033c2f6
Added events: PlayBackgroundMusic, SetBGMGain, SetSFXGain. Added some editor specific code.
2016-01-12 14:03:00 +01:00
236230d12c
Packets now dynamically allocates more memory when they need it.
...
Increased local receive buffer for Client and Server() and removed the magic number that was used
In Server.h and Client.h
(char readBuffer[INPUTSIZE] = { 0 }).
Packets start size has now been increased to 512 bytes.
Changed ComponentInfo::FieldsInOrder to store strings instead of pointers.
Removed HasEntity() and are now using ValidEntity() instead.
2016-01-12 12:00:19 +01:00
d469fe6e9a
Removed picking event and added a pick function to renderer
2016-01-12 11:45:50 +01:00
0630885d92
Many more things done
2016-01-11 19:59:45 +01:00
3c5966d174
Now sort models according to depth.
2016-01-11 17:57:15 +01:00
f80ad1377b
Making use of Doppler effect. Added a bunch of events: Pause, stop, continue, variations of play.
2016-01-11 17:52:27 +01:00
f0ad28bac4
Removed some comments. Basically did nothing
2016-01-11 14:58:15 +01:00
Jace
e8e93587e9
Fixed weird behavior when components would register multiple times (Hint: It should never happen in the first place)
2016-01-11 14:35:41 +01:00
Jace
39dd27726d
MAJOR BREAKING CHANGE: EntityID 0 is now a valid entity. Use EntityID_Invalid as sentry for checks!
...
Also contains inseparable editor changes.
2016-01-11 14:35:41 +01:00
Jace
81024b4a1d
First work on EntityFileWriter for saving levels
2016-01-11 14:35:41 +01:00
Jace
23e78c4947
Cleaned up code
2016-01-11 14:35:15 +01:00
Jace
03456ad731
EntityFileParser
2016-01-11 14:35:15 +01:00
Jace
0bcbcda8b8
EntityFilePreprocessor
...
WIP
WIP
EntityFilePreprocessor
2016-01-11 14:35:15 +01:00
a7b43b06a2
Camera component and RenderQueue changes
2016-01-08 16:21:59 +01:00
beb0967c3b
Merge branch 'master' into OrderedSystemPipeline
...
# Conflicts:
# src/Game/Game.cpp
2016-01-07 16:49:20 +01:00
2838446072
In lack of camera entity I created a Listener cube to test 3D sound. Works fine. Updates listener pos each tick.
2016-01-07 16:03:33 +01:00
d8c4c6e5ff
Created a primitive SoundSystem. Can play a sound with 'P' button. Using resourcemanager. Not using the created components yet.
2016-01-07 15:22:46 +01:00
c4642cc530
Merge branch 'master' into OrderedSystemPipeline
...
# Conflicts:
# include/Engine/Core/SystemPipeline.h
2016-01-07 15:07:16 +01:00
a1ed79dfbf
HealthSystemTest has been created. This runs a single test simple test with HealthEvents and HealthSystem. Also some minor changes
2016-01-07 14:53:31 +01:00
638c236ceb
HealthSystem tested and working. Also the 3 new PlayerEvents seems to work. TODO: a proper test in the testclass
2016-01-07 14:53:31 +01:00
f67f22c82d
Added Healthrelated events and start of HealthSystem, also reverted the crash "fix"
2016-01-07 14:53:31 +01:00
fa8775a72e
Renamed vars and added some comments.
2016-01-07 10:28:18 +01:00
Jace
34cbbb3eb1
Fixed exit crash(es)
2016-01-06 11:20:16 +01:00
de8461e257
SystemPipeline should update systems in order depending on input update priority in AddSystem.
2015-12-18 15:33:25 +01:00
bd82f75dd0
Some merge fixes, needs more work
2015-12-18 15:28:44 +01:00
330f08b926
Merge remote-tracking branch 'origin/master' into Networking
...
# Conflicts:
# include/Game/PlayerSystem.h
# src/Game/Game.cpp
# src/Game/PlayerSystem.cpp
2015-12-18 14:18:53 +01:00
a0255f1b31
Now uses config file to determine if client or server should be started.
2015-12-18 13:34:21 +01:00
a858dab8b6
Network not longer threaded
2015-12-18 12:00:14 +01:00
5c1a93021b
Client now reads address and port from config file. Default address is set to local host.
2015-12-18 11:22:13 +01:00
076030a252
Fixes, mostly name changes
2015-12-17 17:28:43 +01:00
46ae2d39af
Merge branch 'master' into OctTree
...
# Conflicts:
# src/Game/Game.cpp
2015-12-17 16:44:01 +01:00
50822d09fc
Merge remote-tracking branch 'origin/master' into Networking
...
# Conflicts:
# src/Game/Game.cpp
2015-12-17 14:10:02 +01:00
4bb4e29515
More cleaning code
2015-12-17 13:23:15 +01:00
aeca1dec18
Merge remote-tracking branch 'origin/master' into Rendering
...
# Conflicts:
# src/Engine/Editor/EditorSystem.cpp
# src/Engine/Rendering/PickingPass.cpp
# src/Game/Game.cpp
2015-12-17 11:17:58 +01:00
Jace
Viktor Ljung
William Moberg
stiffly
verysecrethero
viktorljung
Jocke
Ayumiwii
Tleety