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

524 Commits

Author SHA1 Message Date
Jace ba93ebbe88 Go away crap maps. 2016-03-12 18:21:36 +01:00
antc13 beee2db5fb Merge branch 'master' of https://github.com/teamfisk/TacticalZ 2016-03-12 17:08:21 +01:00
antc13 1bc4b89a53 Added new models with textures to the map. Every model on the map should now be using a texture. 2016-03-12 17:08:07 +01:00
Tleety dc09ba9158 Resolution should now use a dropdown 2016-03-11 20:02:25 +01:00
antc13 ac096bbf77 Merge branch 'master' of https://github.com/teamfisk/TacticalZ 
# Conflicts:
#	resources/Schema/Entities/CP_Rocky2.xml
 2016-03-11 15:46:39 +01:00
antc13 81634578d9 Updated CP_Rocky2, added a point light to pickups and created 3 different versions of the Floating Crystals above Capture Points. 2016-03-11 15:43:20 +01:00
Tleety 26337ff243 Merge remote-tracking branch 'origin/master' into Menu 2016-03-11 15:07:52 +01:00
FakeShemp 7bdb0d410f Merge branch 'master' of github.com:teamfisk/TacticalZ 2016-03-11 15:04:52 +01:00
FakeShemp 172fb8dfc2 MuzzleFlash entities 2016-03-11 15:04:44 +01:00
William Moberg f036817c0c Merge pull request #203 from teamfisk/SplitSnapshots 
Split snapshots
 2016-03-11 14:35:18 +01:00
verysecrethero 0aedeb61b4 CapturePointSystem now sets all children visible/not visible for each red/blue/spectator 2016-03-11 14:15:46 +01:00
Tleety 44398eac58 Options now has some different resolutions. 2016-03-11 14:11:58 +01:00
Tleety 8ceaae995d Options menu started working on 2016-03-11 13:00:34 +01:00
Tleety 23e6a15c7f Fixed the fill on sprites, added some config button components, started work on option menu 2016-03-11 11:31:53 +01:00
Jocke 7febb7681c Merge remote-tracking branch 'origin/master' into SplitSnapshots 2016-03-11 11:05:41 +01:00
Tleety dab58e09a0 Merge branch 'master' into Menu 2016-03-11 10:20:25 +01:00
Tleety cd6967b310 Merge 2016-03-11 10:20:13 +01:00
Tleety ab70aed840 WIP 2016-03-10 16:15:57 +01:00
verysecrethero 551745b0a6 Merge remote-tracking branch 'origin/master' into CapturePointTake 2016-03-10 16:14:18 +01:00
verysecrethero 8b89df0095 Changed to a better validator 2016-03-10 16:09:54 +01:00
Tleety 4322a5d8da Some fixes for sprites 2016-03-10 15:21:11 +01:00
Jocke a0d60160dd Increased size of socket buffer 2016-03-10 10:58:26 +01:00
FakeShemp e25c9ee690 Merge remote-tracking branch 'origin/master' into Shadows 
# Conflicts:
#	include/Engine/Rendering/DrawFinalPass.h
#	include/Engine/Rendering/Renderer.h
#	resources/Shaders/ForwardPlus.vert.glsl
#	resources/Shaders/ForwardPlusSkinned.vert.glsl
#	src/Engine/Rendering/Renderer.cpp
 2016-03-09 19:38:55 +01:00
Jace fce6e90f3c First person assault weapon idle animation now correct 2016-03-09 19:07:02 +01:00
antc13 07d85bacf6 Added file extension to CP_Rocky2 & moved spawn points on the Y axis. 2016-03-09 18:57:45 +01:00
antc13 15c1b238ef Merge branch 'master' of https://github.com/teamfisk/TacticalZ 2016-03-09 18:46:43 +01:00
antc13 b8839551a4 Created the map CP_Rocky2 but beware, it's still WIP. 2016-03-09 18:46:26 +01:00
viktorljung 1bfd0cce5e Idel 2016-03-09 18:36:53 +01:00
viktorljung 60ff53112e Merge remote-tracking branch 'origin/master' into Movement 2016-03-09 18:27:36 +01:00
viktorljung d42d886dcc 3rd person animations synced with 1st person animations 2016-03-09 18:27:09 +01:00
Tleety 7e7d98eaae Merge remote-tracking branch 'origin/master' into Menu 2016-03-09 17:24:41 +01:00
Tleety 1104166039 TextureSprite Resource that use GL_NEAREST for sampling aswell as some StartMenu changes 2016-03-09 17:24:21 +01:00
viktorljung 7141756992 Merge remote-tracking branch 'origin/Weapons' into Movement 
# Conflicts:
#	resources/Schema/Entities/Player.xml
#	resources/Schema/Entities/PlayerAssaultBlue.xml
#	resources/Schema/Entities/PlayerAssaultFallbackBlue.xml
#	resources/Schema/Entities/PlayerAssaultFallbackRed.xml
#	resources/Schema/Entities/PlayerAssaultRed.xml
#	resources/Schema/Entities/aaaatestremoveme.xml
#	resources/Schema/Entities/aim_rays.xml
 2016-03-09 15:59:36 +01:00
viktorljung de125663fd Merge remote-tracking branch 'origin/master' into Movement 
# Conflicts:
#	assets
#	resources/Schema/Entities/Player.xml
#	resources/Schema/Entities/PlayerAssaultFallbackBlue.xml
#	resources/Schema/Entities/PlayerAssaultFallbackRed.xml
#	resources/Schema/Entities/PlayerAssaultRed.xml
#	resources/Schema/Entities/aaaatestremoveme.xml
#	resources/Schema/Entities/aim_rays.xml
#	src/Engine/Rendering/BoneAttachmentSystem.cpp
 2016-03-09 15:54:00 +01:00
Jace 34e551663f Merge remote-tracking branch 'origin/master' into Weapons 
# Conflicts:
#	assets
#	resources/Schema/Entities/Player.xml
#	resources/Schema/Entities/PlayerAssaultFallbackBlue.xml
#	resources/Schema/Entities/PlayerAssaultFallbackRed.xml
#	resources/Schema/Entities/PlayerAssaultRed.xml
#	resources/Schema/Entities/aaaatestremoveme.xml
#	resources/Schema/Entities/aim_rays.xml
 2016-03-09 15:52:13 +01:00
Jace 9d368348d5 Updated 3rd person and 1st person animation trees for assault to allow for third person weapon animations 2016-03-09 15:48:57 +01:00
Tleety 49040e9c4b StartMenu system now sets the main menu camera to active as long as it exists. 2016-03-09 15:29:42 +01:00
Tleety a76a04260f StartSystem skeleton and some changes to the StartMenu 2016-03-09 15:10:54 +01:00
Tleety 500ebfa08c Menu should now show the correct server IP instead of default. 
Start of a StartMenu entity that will show when the game is started.
 2016-03-09 14:34:02 +01:00
viktorljung 70ec075887 3rd person aim improvements 2016-03-09 13:19:56 +01:00
Tleety 704242597a Merge remote-tracking branch 'origin/master' into Menu 
# Conflicts:
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/NewMapWSpectatorCam.xml
#	resources/Schema/Types/Entity.xsd
#	src/Game/Game.cpp
 2016-03-09 11:49:42 +01:00
Tobias Dahl 697da620d3 Merge pull request #179 from teamfisk/TeamPickCamera 
Spectator camera system
 2016-03-09 11:41:05 +01:00
William Moberg b782e73556 Falsified DepthSort for SpectatorCamera buttons and CP-HUD elements. 2016-03-09 10:56:05 +01:00
Tleety 95f68cc888 ConnectRequest event and some other shit 2016-03-08 22:24:32 +01:00
Tleety 3394d65055 Servers now show up in the server list. 2016-03-08 18:13:21 +01:00
verysecrethero 7ee4ea637b Merge remote-tracking branch 'origin/master' into TeamPickCamera 2016-03-08 17:30:22 +01:00
Tleety ba9208085b WIP 2016-03-08 16:52:56 +01:00
Tleety f8ab52c72c WIP 2016-03-08 16:15:54 +01:00
viktorljung f934f972e8 Merge remote-tracking branch 'origin/Weapons' into Movement 
# Conflicts:
#	resources/Schema/Entities/PlayerDefenderBlue.xml
 2016-03-08 14:34:21 +01:00
viktorljung 8d1877321a Fixed BoneAttachment offset rotation 2016-03-08 14:32:50 +01:00