BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 3678bf6d18 Entity parenting on parse ecs-reference Jace 2016-01-12 12:50:31 +01:00
  • 236230d12c Packets now dynamically allocates more memory when they need it. Jocke 2016-01-12 12:00:19 +01:00
  • 2450769190 some cleanup viktorljung 2016-01-12 11:51:47 +01:00
  • d469fe6e9a Removed picking event and added a pick function to renderer viktorljung 2016-01-12 11:45:50 +01:00
  • 39b9b3c2a7 Semi-working entity references (no editor support) Jace 2016-01-12 11:35:32 +01:00
  • a20ca49d53 Fixed typo backslash instead of slash in various classes (the includes) verysecrethero 2016-01-12 10:46:34 +01:00
  • 0f6528e0c7 WIP DeveloperConsole Jace 2016-01-04 10:46:10 +01:00
  • 0a3d3f5392 Rewrote ConfigFile to use "boost-extras" ini_file parser instead for property_tree, since property_tree is a pain to work with. Jace 2015-12-30 22:54:29 +01:00
  • c0b31dc92c DeveloperConsole::Consume for strings Jace 2015-12-29 22:54:07 +01:00
  • c5b4ea84a0 Added LOG_LEVEL_SCOPE() which sets the log level and resets it to the previous value once it goes out of scope. Couldn't remember what I needed this for when I was done writing it, but maybe someone will find a use for it... Jace 2015-12-29 22:42:58 +01:00
  • b5605c839d Developer Console that lets you bind variables to be changed at runtime sippeangelo 2015-12-04 15:36:34 +01:00
  • 0630885d92 Many more things done Ayumiwii 2016-01-11 19:59:45 +01:00
  • 24ba3ae1f6 WIP, falloff things. Tleety 2016-01-11 16:50:38 +01:00
  • fa6dd2dc67 Basic transparancy working. Tleety 2016-01-11 15:28:17 +01:00
  • 3c5966d174 Now sort models according to depth. Tleety 2016-01-11 14:12:54 +01:00
  • 0cf8d26557 Revert "Revert "Forward+"" Tleety 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. stiffly 2016-01-11 17:52:27 +01:00
  • 774bb8ce56 Simplified PlayerSystem branches a lot! Thanks William! verysecrethero 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 verysecrethero 2016-01-11 17:15:49 +01:00
  • 00805d30d0 Merge remote-tracking branch 'origin/master' into ShootEvent verysecrethero 2016-01-11 17:06:48 +01:00
  • 3feee7fd35 Changed the structure of how RenderJobs are handled viktorljung 2016-01-11 17:01:17 +01:00
  • 84818f6fcb Merge pull request #28 from teamfisk/ecs William Moberg 2016-01-11 16:49:40 +01:00
  • 349fa9d7fa Fixed crash when creating new entities Jace 2016-01-11 16:47:30 +01:00
  • 2a5e0420c8 Added template entity "Empty.xml" for use as root entity when creating a new map. Jace 2016-01-11 16:40:26 +01:00
  • 2f6261dfbf EShoot: changed to string weaponType to int currentlyEquippedItem verysecrethero 2016-01-11 15:43:12 +01:00
  • 2cd0e94a60 Changed the comparison method in PlayerSystem since its currently using doubles verysecrethero 2016-01-11 14:37:43 +01:00
  • 8f92de3683 xml/xsd files changed type to double. fixed cooldownbug in PlayerSystem. Added 4 tests in ShootEventTest and generalized it a lot verysecrethero 2016-01-11 13:34:50 +01:00
  • 31c1c0ac8d New Event: EShoot. New Components: PrimaryItem,SecondaryItem. New Test: ShootEventTest. Added LeftMouseRelease->Shoot in PlayerSystem verysecrethero 2016-01-08 16:19:18 +01:00
  • b37ffc7449 WIP Model component not working. Jocke 2016-01-11 14:34:04 +01:00
  • 6c13916eec Removed unnecessary code. Jocke 2016-01-06 13:49:54 +01:00
  • f0ad28bac4 Removed some comments. Basically did nothing stiffly 2016-01-06 11:39:32 +01:00
  • 4a516a4d86 Added ComponentInfo::FieldsInOrder to be able to loop through component fields in a consistent order based on the component XSD definition Jace 2016-01-11 14:56:53 +01:00
  • 21aea6f31d Added World::ValidEntity for checking if an entity exists or not Jace 2016-01-11 13:57:25 +01:00
  • 297a3fb493 Support for "name" attribute on entities Jace 2016-01-11 11:24:00 +01:00
  • c47ef61ddc Temporary fix for widgets being annoying entities in the editor Jace 2016-01-11 11:20:25 +01:00
  • e8e93587e9 Fixed weird behavior when components would register multiple times (Hint: It should never happen in the first place) Jace 2016-01-11 10:38:23 +01:00
  • 39dd27726d MAJOR BREAKING CHANGE: EntityID 0 is now a valid entity. Use EntityID_Invalid as sentry for checks! Jace 2016-01-11 10:26:45 +01:00
  • 6adc98eea5 Now writes entities to file instead of stdout... Jace 2016-01-11 10:21:22 +01:00
  • ad4e723677 Added nativefiledialog to README Jace 2016-01-11 10:16:06 +01:00
  • 11d547cde8 Entity 0 is now a real entity in the world, created by the first entity read while importing. This makes the difference between map files and entity files automatic, since consecutive entity file loads should automatically get the world as parent, as long as the world entity has been created earlier. Jace 2016-01-08 12:42:32 +01:00
  • 24b9e951c2 Added stride information to ComponentInfo, refactored FieldOffsets and FieldTypes into new struct Field_t Fields while I was at it. Jace 2016-01-08 11:47:58 +01:00
  • 81024b4a1d First work on EntityFileWriter for saving levels Jace 2016-01-08 11:21:10 +01:00
  • 23e78c4947 Cleaned up code Jace 2016-01-07 14:43:54 +01:00
  • 3e7f27e1fe Added error handler for DOM parsers Jace 2016-01-07 14:30:39 +01:00
  • ee83394678 Unified some previously duplicated code Jace 2016-01-07 14:06:14 +01:00
  • 03456ad731 EntityFileParser Jace 2016-01-07 13:10:44 +01:00
  • 0bcbcda8b8 EntityFilePreprocessor Jace 2015-12-17 17:26:36 +01:00
  • c6655ce0d3 Merge pull request #26 from teamfisk/revert-25-Forward+ Jace 2016-01-11 13:49:02 +01:00
  • b908a9f9c6 Revert "Forward+" Jace 2016-01-11 13:48:55 +01:00
  • 0e90382fd1 Merge branch 'master' of https://github.com/teamfisk/TacticalZ into MayaExporter antc13 2016-01-11 13:09:09 +01:00
  • dc7ed2e0ba Merge pull request #25 from teamfisk/Forward+ Jace 2016-01-11 12:43:43 +01:00
  • b8db80bc40 Added camera to PickingPass and fixed memory leak viktorljung 2016-01-11 10:47:39 +01:00
  • f71bfca142 Fixed cullLights into CullLights Tleety 2016-01-11 10:23:22 +01:00
  • dbb44fb4e4 Changing cullLights to Culllights, need to do this in 2 commits since Git extensions is fucked. Tleety 2016-01-11 10:22:56 +01:00
  • 1667358e0c We now export animations. antc13 2016-01-08 16:47:04 +01:00
  • 3467315aef Lots of things done Ayumiwii 2016-01-08 16:42:59 +01:00
  • a7b43b06a2 Camera component and RenderQueue changes viktorljung 2016-01-08 16:21:59 +01:00
  • 6e6460a000 Commented out the bugged models Tleety 2016-01-08 16:15:18 +01:00
  • 3cce9f8075 Using absolute transform stiffly 2016-01-08 15:29:20 +01:00
  • 9f871bbe7c Lights now use the absolute position instead of it's local position. Tleety 2016-01-08 14:31:44 +01:00
  • 2bd60be741 Merge remote-tracking branch 'origin/master' into Forward+ Tleety 2016-01-08 14:14:43 +01:00
  • dab4ba2164 Pointlights are now using the pointlight component and the Light renderqueue to draw. Tleety 2016-01-08 14:12:09 +01:00
  • 25a99a04c5 Added Visable bool and a better description to Pointlight component. Tleety 2016-01-08 14:11:35 +01:00
  • 13ade6d7f2 Merge pull request #24 from teamfisk/HealthSystem William Moberg 2016-01-08 11:54:11 +01:00
  • 592776e783 Fixed so the PlayerDeath event doesn't get spammed while the player is dead. Also made sure that any remaining healthDeltas are cleared when dead. verysecrethero 2016-01-08 11:37:51 +01:00
  • ff44dccb33 Merge pull request #23 from teamfisk/OrderedSystemPipeline verysecrethero 2016-01-08 10:32:58 +01:00
  • ef9ce7932a New small fix. OrderedSystemPipeline William Moberg 2016-01-07 17:40:47 +01:00
  • da6e50dc7e Correct orientation. Need to clean this up. stiffly 2016-01-07 17:04:43 +01:00
  • beb0967c3b Merge branch 'master' into OrderedSystemPipeline William Moberg 2016-01-07 16:49:20 +01:00
  • 0e0a361a38 HotFix: Updated the CMakeList.txt in src/Game so it has the HealthSystem.cpp. This is needed otherwise the solution cant find that file verysecrethero 2016-01-07 16:36:18 +01:00
  • 6ebc4fc784 Merge pull request #22 from teamfisk/HealthSystem William Moberg 2016-01-07 16:17:17 +01:00
  • 7fb71f17b2 Destruct all systems properly in the pipeline. William Moberg 2016-01-07 16:13:52 +01:00
  • 2838446072 In lack of camera entity I created a Listener cube to test 3D sound. Works fine. Updates listener pos each tick. stiffly 2016-01-07 16:03:33 +01:00
  • e52c0c9633 Now using the easier/cleaner way of getting/setting the HealthProperties verysecrethero 2016-01-07 15:27:39 +01:00
  • d8c4c6e5ff Created a primitive SoundSystem. Can play a sound with 'P' button. Using resourcemanager. Not using the created components yet. stiffly 2016-01-07 15:22:46 +01:00
  • 578ca13f79 Merge remote-tracking branch 'origin/master' into HealthSystem verysecrethero 2016-01-07 15:19:32 +01:00
  • 4048ce6bd4 Small fix. William Moberg 2016-01-07 15:18:35 +01:00
  • c4642cc530 Merge branch 'master' into OrderedSystemPipeline William Moberg 2016-01-07 15:07:16 +01:00
  • 32ebc061b4 Merge pull request #21 from teamfisk/AndersTest William Moberg 2016-01-07 14:57:12 +01:00
  • a1ed79dfbf HealthSystemTest has been created. This runs a single test simple test with HealthEvents and HealthSystem. Also some minor changes verysecrethero 2016-01-07 14:29:04 +01:00
  • 638c236ceb HealthSystem tested and working. Also the 3 new PlayerEvents seems to work. TODO: a proper test in the testclass verysecrethero 2016-01-06 16:38:50 +01:00
  • f67f22c82d Added Healthrelated events and start of HealthSystem, also reverted the crash "fix" verysecrethero 2016-01-06 13:36:53 +01:00
  • f3ff433bf7 Merge remote-tracking branch 'origin/master' into AndersTest verysecrethero 2016-01-07 14:51:08 +01:00
  • 85ff86a2fe Revert "Exit Crash has been dealt with. There is no need to unsubscribe game since m_ContextRelays has already been destroyed at that point" verysecrethero 2016-01-07 14:50:13 +01:00
  • fa8775a72e Renamed vars and added some comments. William Moberg 2016-01-07 10:28:18 +01:00
  • 49884d7e60 Fix for crash when unsubscription during event processing (untested) Jace 2016-01-06 13:47:02 +01:00
  • 7ae42a5bf7 Removed some comments. Basically did nothing stiffly 2016-01-06 11:39:32 +01:00
  • e7bb8954bf Merge remote-tracking branch 'origin/master' into Forward+ Tleety 2016-01-06 11:35:55 +01:00
  • e510f2b88c Forward plus render pass now removed from Renderer.cpp to it's own class. Tleety 2016-01-06 11:32:42 +01:00
  • 34cbbb3eb1 Fixed exit crash(es) Jace 2016-01-06 11:20:16 +01:00
  • 0ae6c42df8 Exit Crash has been dealt with. There is no need to unsubscribe game since m_ContextRelays has already been destroyed at that point verysecrethero 2016-01-05 15:22:16 +01:00
  • 3678cceb1c Merge remote-tracking branch 'origin/master' into AndersTest verysecrethero 2016-01-05 14:48:16 +01:00
  • eb5fca898f Fix small bug with push_back order FakeShemp 2015-12-21 12:55:25 +01:00
  • c9db46564f Spitting out files WIP antc13 2015-12-18 16:21:07 +01:00
  • de8461e257 SystemPipeline should update systems in order depending on input update priority in AddSystem. William Moberg 2015-12-18 15:33:25 +01:00
  • bd82f75dd0 Some merge fixes, needs more work viktorljung 2015-12-18 15:28:44 +01:00
  • eb69e03e82 Merge branch 'Forward+' of github.com:teamfisk/TacticalZ into Forward+ Tleety 2015-12-18 15:28:25 +01:00
  • d38f58165f Merge remote-tracking branch 'origin/master' into Forward+ Tleety 2015-12-18 15:27:47 +01:00
  • c133223bac Merge pull request #19 from teamfisk/Networking Viktor Ljung 2015-12-18 14:54:11 +01:00
  • 2f6d4fcd0b Adjusted some of the corefiles back to the original in preparation for the Pull Request verysecrethero 2015-12-18 14:49:35 +01:00