7a8604bf2b
CapturePointSystem now tracks and verifies if a capturePoint can be taken over. Also the time is changed faster the more players stand on the capturepoint (number*dt). Also took care of the problem when both teams have the same contested capturepoint.
...
Added variable in the CapturePoint component: CapturePointNumber. This is needed since we cant know what capturepoint is next to be taken over otherwise.
Updated the CapturePointTest according to current CapturePointSystem
TODO: try to refactor code in CapturePointSystem
2016-01-13 15:58:52 +01:00
3a1056a2c3
2 new Events: ECaptured, EWin
...
Added new variable in CapturePoint: IsHomeCapturePointForTeam
CapturePointSystem updated so -5 = team 2 owns it, +5 = team 1 owns it. Its also looking for a winner each update
Updated Test. TODO: better Tests
2016-01-13 15:58:52 +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
147b116f20
Fixed typo backslash instead of slash in various classes (the includes)
2016-01-13 15:58:52 +01:00
f0b425614d
Simplified PlayerSystem branches a lot! Thanks William!
2016-01-13 15:58:52 +01:00
4b672b11e7
EquippedItem,Ammo got changed to int instead of double. Loading entities from map the new way in Tests. ComponentWrapper:s Name is now Type
2016-01-13 15:58:52 +01:00
e865971fdd
EShoot: changed to string weaponType to int currentlyEquippedItem
...
PlayerSystem.h: added HeldItem enum
PlayerSystem.cpp: simplified writing doubles, uses HeldItem enum
ShootEventTest.cpp: simplified writing doubles
2016-01-13 15:58:52 +01:00
878c71b56a
Changed the comparison method in PlayerSystem since its currently using doubles
2016-01-13 15:58:52 +01:00
ec4d5fbfa8
xml/xsd files changed type to double. fixed cooldownbug in PlayerSystem. Added 4 tests in ShootEventTest and generalized it a lot
2016-01-13 15:58:52 +01:00
184af95507
New Event: EShoot. New Components: PrimaryItem,SecondaryItem. New Test: ShootEventTest. Added LeftMouseRelease->Shoot in PlayerSystem
...
TODO: generalize the test
2016-01-13 15:58:52 +01:00
a143ae7c85
Changed to relative #include paths.
2016-01-13 15:53:55 +01:00
e6527196ed
Modified a few files according to the current CodeStandards
2016-01-13 15:50:30 +01:00
Jace
d6ef527f25
Basic collisions using Octree. Seems buggy over octree boundaries.
2016-01-13 15:34:43 +01:00
c14f3789f7
PlayerSystem now counts down the CoolDownTimer on both HeldItems for the player. Updated ShootEventTest to verify this
2016-01-13 15:26:10 +01:00
24486c314d
Reworked the Exporter.
2016-01-13 14:03:58 +01:00
Jace
8ed4ba1219
Added missing include for Octree
2016-01-13 12:16:35 +01:00
Jace
311475cbb6
Renamed all OctTree to Octree (More OCD)
2016-01-13 12:15:36 +01:00
Jace
8164a955d6
Renamed OctTree files to Octree (OCD to the max)
2016-01-13 12:15:09 +01:00
a58cc33ed0
WIP, multithreaded loading based on exceptions, very slow probably.
2016-01-13 10:58:31 +01:00
923589524b
Fix the accelaration (possibly)
...
I haven't tested so I might just have destroyed everything.
2016-01-12 21:25:15 +01:00
704e8825c4
Merge pull request #29 from teamfisk/Networking
...
Networking
2016-01-12 17:48:33 +01:00
2284399538
Removed Close method from Client, Server and Network.
...
Removed legacy variable m_ThreadIsRunning in Client.h and Server.h.
Removed m_EventBroker->Unsubscribe(m_EInputCommand) in Client destructor.
2016-01-12 17:47:03 +01:00
00eeed2e20
Broken stuff, refactoring
2016-01-12 16:16:42 +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
7b62dc19bf
Spitting out Meshes & Animation Data to file.
2016-01-12 15:39:29 +01:00
c9f11f62d2
Does not delete emitters that are paused and has not yet been played.
2016-01-12 15:37:10 +01:00
5697e8bc85
Deleting an entity now tells openal to behave accordingly.
2016-01-12 14:51:10 +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
2bf1d53f2c
Merge remote-tracking branch 'origin/master' into Networking
2016-01-12 13:17: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
2450769190
some cleanup
2016-01-12 11:51:47 +01:00
d469fe6e9a
Removed picking event and added a pick function to renderer
2016-01-12 11:45:50 +01:00
a20ca49d53
Fixed typo backslash instead of slash in various classes (the includes)
2016-01-12 10:46:34 +01:00
0630885d92
Many more things done
2016-01-11 19:59:45 +01:00
24ba3ae1f6
WIP, falloff things.
...
# Conflicts:
# resources/Schema/Components/PointLight.xsd
# resources/Shaders/ForwardPlus.frag.glsl
2016-01-11 17:57:15 +01:00
fa6dd2dc67
Basic transparancy working.
2016-01-11 17:57:15 +01:00
3c5966d174
Now sort models according to depth.
2016-01-11 17:57:15 +01:00
0cf8d26557
Revert "Revert "Forward+""
...
This reverts commit b908a9f9c6
2016-01-11 17:56:58 +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
774bb8ce56
Simplified PlayerSystem branches a lot! Thanks William!
2016-01-11 17:36:23 +01:00
0cc58f088a
EquippedItem,Ammo got changed to int instead of double. Loading entities from map the new way in Tests. ComponentWrapper:s Name is now Type
2016-01-11 17:15:49 +01:00
00805d30d0
Merge remote-tracking branch 'origin/master' into ShootEvent
2016-01-11 17:06:48 +01:00
3feee7fd35
Changed the structure of how RenderJobs are handled
2016-01-11 17:01:17 +01:00
84818f6fcb
Merge pull request #28 from teamfisk/ecs
...
New entity loading and saving
2016-01-11 16:49:40 +01:00
Jace
349fa9d7fa
Fixed crash when creating new entities
2016-01-11 16:47:30 +01:00
Jace
2a5e0420c8
Added template entity "Empty.xml" for use as root entity when creating a new map.
2016-01-11 16:40:26 +01:00
2f6261dfbf
EShoot: changed to string weaponType to int currentlyEquippedItem
...
PlayerSystem.h: added HeldItem enum
PlayerSystem.cpp: simplified writing doubles, uses HeldItem enum
ShootEventTest.cpp: simplified writing doubles
2016-01-11 15:49:33 +01:00
2cd0e94a60
Changed the comparison method in PlayerSystem since its currently using doubles
2016-01-11 15:49:33 +01:00
verysecrethero
William Moberg
Jace
antc13
FakeShemp
Jocke
Ayumiwii
viktorljung
stiffly
Tleety