 Jace
|
c1b9404e52
|
Created a FileDropped event for when a file is dropped onto the client by the OS
|
2015-12-17 15:30:43 +01:00 |
|
|
Jace
|
8000654005
|
Model loading now fetches material opacity value properly
|
2015-12-17 15:28:05 +01:00 |
|
 stiffly
|
000adb198f
|
Reset RenderQueueFactory.cpp to original state
|
2015-12-17 14:36:36 +01:00 |
|
|
stiffly
|
51a2da9cc0
|
Removed old Event that is not used
|
2015-12-17 14:28:17 +01:00 |
|
|
stiffly
|
0f0a1ceca7
|
No more fake packet loss
|
2015-12-17 14:22:31 +01:00 |
|
|
stiffly
|
50822d09fc
|
Merge remote-tracking branch 'origin/master' into Networking
# Conflicts:
# src/Game/Game.cpp
|
2015-12-17 14:10:02 +01:00 |
|
 William Moberg
|
3e2ffdb85b
|
Fixed comment on Trigger events.
|
2015-12-17 13:48:35 +01:00 |
|
|
William Moberg
|
5160a45b44
|
Made Ray into a class with checks so the direction will always be normalized.
|
2015-12-17 13:41:34 +01:00 |
|
|
William Moberg
|
03d5f0dd67
|
Added an macro IF_DEBUG_IS(x) that executes if run in debug mode, AABB has a check so max and min corners are set properly in debug mode.
|
2015-12-17 13:31:54 +01:00 |
|
|
stiffly
|
4bb4e29515
|
More cleaning code
|
2015-12-17 13:23:15 +01:00 |
|
|
stiffly
|
a6a08f48bb
|
Merge remote-tracking branch 'origin/Networking' into Networking
# Conflicts:
# include/Engine/Network/Client.h
# src/Engine/Network/Client.cpp
|
2015-12-17 11:24:34 +01:00 |
|
|
stiffly
|
ba831f8a3c
|
WIP Cleaning
|
2015-12-17 10:59:55 +01:00 |
|
 Tobias Dahl
|
1a9b765d47
|
Merge pull request #17 from teamfisk/Editor
Kinda usable editor
|
2015-12-17 10:59:08 +01:00 |
|
|
Jace
|
c8460e0a6c
|
It's no use
|
2015-12-17 10:55:54 +01:00 |
|
|
stiffly
|
4c29e071af
|
Cleaned code
|
2015-12-17 10:47:08 +01:00 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
Tleety
|
1e370bac13
|
ForwardPlus base debug commit.
|
2015-12-15 15:28:37 +01:00 |
|
|
Jocke
|
e940c1d604
|
WIP
|
2015-12-15 14:55:56 +01:00 |
|