BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,296 Commits 116 Branches 0 Tags
master
Commit Graph

2296 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jace b87f559291 Updated default configs with editor stuff 2015-12-17 10:46:49 +01:00
Jace d4f5856304 Component attributes no longer get set on the wrong entity when switching selection while editing a field 2015-12-17 10:44:34 +01:00
viktorljung 6a3c14540d fixes 2015-12-17 10:38:13 +01:00
Jocke 2cb5441b1c Merge remote-tracking branch 'origin/Networking' into Networking 
# Conflicts:
#	src/Engine/Network/Client.cpp
 2015-12-17 09:47:15 +01:00
stiffly 97a0d97b0b Can now send transform components. 2015-12-16 17:56:44 +01:00
Jace a914a7f924 Switched to deps/master branch 2015-12-16 17:22:35 +01:00
Jace dbbbb7b4e7 Working rotations and translations relative to global and local space for children 2015-12-16 17:20:56 +01:00
William Moberg a23d69af9a Removed old relics from OctTree testing in OctTree. 2015-12-16 17:08:55 +01:00
Jocke 425f3ca3dd Fixed "trying to read more than package size" warnings. 2015-12-16 16:49:18 +01:00
William Moberg 6d1cbd928e Improved collision logic, still not perfect since it updates before PlayerSystem. 2015-12-16 16:34:27 +01:00
Jocke 6da5fd1263 Restructured code and added bool to stop client from spamming Snapshots to a server when 
it wasn't connected to one.
 2015-12-16 15:47:51 +01:00
Jocke 6eebce05af Merge remote-tracking branch 'origin/Networking' into Networking 2015-12-16 14:58:36 +01:00
Jocke 58a9d38e26 Added a class that client and server inherits from. 
Class and server now share the same pointer i game.
You are now able to start a client and a server on the same computer.
 2015-12-16 14:56:53 +01:00
stiffly 50ccf96268 Movement code not buggy anymore. Also changed package to not allocate more data than needed. 2015-12-16 13:52:16 +01:00
viktorljung 5602b32507 Forward+ Fixes 2015-12-16 13:36:38 +01:00
William Moberg cf0ff9bfe5 Simple quickly made CollisionSystem. 2015-12-16 12:23:08 +01:00
William Moberg d10df6ae09 TriggerSystem implemented and working. 2015-12-16 12:22:15 +01:00
William Moberg 99b76d7ae1 Fixed returning address to temporary in functions. AABB also constructible from glm::vec4s. 2015-12-16 12:19:43 +01:00
Jace 661532e355 Slightly more usable entity tree 2015-12-16 12:05:55 +01:00
Jace bd6adcc157 Added SetParent to World 2015-12-16 12:05:37 +01:00
antc13 67017fcaf4 Stepping through the timeline. 2015-12-16 11:33:42 +01:00
stiffly a2d55feed1 Merge remote-tracking branch 'origin/Networking' into Networking 
# Conflicts:
#	src/Engine/Network/Client.cpp
#	src/Engine/Network/Server.cpp
 2015-12-16 11:12:15 +01:00
Jocke e74b2b6874 Made it easier for non network members to create packages and extract information from them by addin PopFrontString() and PopFrontPrimitive<type>(). 2015-12-16 10:40:40 +01:00
Jace 322aedaf72 Basic transformation widgets 2015-12-16 09:47:38 +01:00
stiffly 3f602c9d63 Test code 2015-12-15 17:55:08 +01:00
stiffly 082b3fd3df Removed old input events from client 2015-12-15 17:22:46 +01:00
William Moberg 04a01104b5 Merge branch 'master' into OctTree 
# Conflicts:
#	src/Engine/CMakeLists.txt
#	src/Game/Game.cpp
 2015-12-15 17:11:11 +01:00
stiffly 9b348a7d97 Updated movement code once again. 2015-12-15 16:50:59 +01:00
stiffly 889e0bb3d3 Cleaned up PlayerSystem. Sets velocity to 0 every frame. 2015-12-15 16:35:09 +01:00
stiffly 1669649186 Fixed bug with entityID. Also trying to fix movement WIP. 2015-12-15 16:24:09 +01:00
antc13 498afb3a5e Merge branch 'MayaExporter' of https://github.com/teamfisk/TacticalZ into MayaExporter 
# Conflicts:
#	tools/MayaExporter/MayaExporter/Menu.h
 2015-12-15 15:41:18 +01:00
Tleety 1431bd1a11 DebugChanges 2015-12-15 15:39:23 +01:00
William Moberg ed82a0939a Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree 2015-12-15 15:37:14 +01:00
William Moberg e2417be8c7 Very simple CollisionSystem made, 'Z','Y' to toggle on/off. 2015-12-15 15:36:28 +01:00
stiffly 472a8db81a Various bug fixes. 2015-12-15 15:32:31 +01:00
viktorljung fa66e9ff47 Camera Switch event now working, Camera models Rotation still bugged 2015-12-15 15:29:19 +01:00
Tleety 1e370bac13 ForwardPlus base debug commit. 2015-12-15 15:28:37 +01:00
antc13 4e535c1102 File Writer WIP. Rework soon™ 2015-12-15 15:24:46 +01:00
Jocke e940c1d604 WIP 2015-12-15 14:55:56 +01:00
stiffly 478c692315 Refactoring. Client and server has Update Loop that runs before any game logic each frame. 2015-12-15 14:53:56 +01:00
William Moberg 170610bcb1 Added a TriggerSystem, seems to work as intended. 2015-12-15 14:49:52 +01:00
verysecrethero 454ed0032b Refactored some RayVsModel tests 2015-12-15 14:01:49 +01:00
verysecrethero 1910ab705b AndersTest misc small mergefixes 2015-12-15 13:48:14 +01:00
stiffly 0a8a9e5099 Merge remote-tracking branch 'origin/master' into Networking 
# Conflicts:
#	src/Engine/Rendering/RenderState.cpp
#	src/Game/Game.cpp
 2015-12-15 11:50:01 +01:00
FakeShemp 1689370356 Export the skeletons 
Not really tested though
 2015-12-15 11:49:59 +01:00
verysecrethero f9508657f5 Merge remote-tracking branch 'origin/master' into AndersTest 
# Conflicts:
#	include/Engine/Core/InputController.h
#	include/Game/Game.h
 2015-12-15 11:32:47 +01:00
stiffly b698a0d36f WIP 
Adding models now crashes. Threading
Added a create player event that currently is not used.
 2015-12-15 11:21:46 +01:00
verysecrethero 1229a99af4 Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree 2015-12-15 11:07:51 +01:00
verysecrethero 8e431c8edd RayVsModel && RayVsAABB tests added and working. Also adjusted RayVsModel,RayVsAABB with deltas when values are very close to each other (floatingprecision problems) 2015-12-15 11:07:09 +01:00
Jace 51dd627ae3 Added Fonts to deploy.bat 2015-12-15 09:49:43 +01:00