 Jace
|
7f328332c4
|
Merge branch 'master' into particles
Conflicts:
src/GameWorld.cpp
vs11/Returngeance/Returngeance.vcxproj
vs11/Returngeance/Returngeance.vcxproj.filters
|
2014-06-03 17:19:53 +02:00 |
|
|
Jace
|
0ad3d8ed76
|
Fixed vehicle selection hiding on selection
|
2014-06-03 03:55:35 +02:00 |
|
|
Jace
|
46f377c94c
|
Interface input revised
|
2014-06-03 03:55:34 +02:00 |
|
 Stiffly
|
349fab54a4
|
Merge remote-tracking branch 'origin/master' into particles
Conflicts:
src/GUI/GameFrame.h
src/GUI/TextureFrame.h
vs11/Returngeance/Returngeance.vcxproj.filters
|
2014-06-02 17:37:25 +02:00 |
|
|
Jace
|
61fab09ceb
|
UI scaling properly
|
2014-06-02 16:10:52 +02:00 |
|
|
Jace
|
72420d4248
|
WIP Fullscreen Stuff (UI not scaling properly yet)
|
2014-06-01 03:05:42 +02:00 |
|
 Tleety
|
6e78307249
|
Merge remote-tracking branch 'origin/master' into deffered_rendering
Conflicts:
src/GUI/GameFrame.h
src/GameWorld.cpp
vs11/Returngeance/Returngeance.vcxproj.filters
|
2014-05-31 17:16:29 +02:00 |
|
|
Jace
|
a6906886f5
|
Vehicle selection!
|
2014-05-31 03:45:37 +02:00 |
|
|
Tleety
|
cc84f04542
|
Transparent objects working.
|
2014-05-29 23:59:36 +02:00 |
|
|
Jace
|
ef0ff5a99b
|
WIP Awesometastic debugging
|
2014-05-28 22:05:17 +02:00 |
|
|
Jace
|
cc42b94000
|
Viewports fixed. Damage HUD. Free steering fixed.
|
2014-05-28 20:22:38 +02:00 |
|
|
Jace
|
d4b28a2228
|
Semi-working world rendering
|
2014-05-27 06:45:26 +02:00 |
|
|
Jace
|
22442708cc
|
One hell of a GUI interface (minus graphical)
"how does this even work lol"
|
2014-05-26 03:33:11 +02:00 |
|
|
Jace
|
07c74ff9f5
|
I'll create a GUI interface using Visual Basic, see if I can track an IP address
|
2014-05-25 04:12:28 +02:00 |
|
|
Jace
|
9723d80742
|
And then Microsoft happened...
|
2014-05-15 21:50:49 +02:00 |
|
|
Jace
|
6684aa06b7
|
Merge branch 'master' into gui
Conflicts:
src/GUI/Frame.h
src/InputManager.cpp
|
2014-05-15 21:16:43 +02:00 |
|
|
Jace
|
d259811795
|
Xbox360 controller support
|
2014-05-13 02:24:42 +02:00 |
|
|
Jace
|
ad19848c1b
|
WIP ECS GUI
|
2014-05-12 22:33:59 +02:00 |
|
|
Jace
|
9e8c3161e0
|
WIP Frame
|
2014-04-29 13:58:37 +02:00 |
|
|
Jace
|
dfd9425473
|
WIP Frame
|
2014-04-23 02:19:17 +02:00 |
|
|
Jace
|
1e2f7fdd5c
|
Skeleton MessageRelay
|
2014-04-22 19:15:02 +02:00 |
|