Daniel Collin
6a46001a6e
Added marker for where the data is edited
2012-10-28 18:10:51 +01:00
Daniel Collin
b936ced270
Sending data loaded from the XML over to the demo now works
2012-10-28 17:10:22 +01:00
Daniel Collin
275dbf68ec
Can now load XML files to the rocket data
2012-10-28 15:56:01 +01:00
Daniel Collin
2c88f2470b
Preparation for proper save
2012-10-28 14:24:33 +01:00
Daniel Collin
c8b656c03c
Separated createTrack to own c/h as we need to call it from more places that Editor.c
2012-10-28 13:57:31 +01:00
Daniel Collin
36bbcfda6d
Current status
2012-10-28 03:23:09 +01:00
Daniel Collin
83500b8b86
Some debug logging
2012-10-27 22:09:51 +02:00
Daniel Collin
25dbedd792
Key up/down handling
2012-10-27 17:52:26 +02:00
Daniel Collin
376be44f44
Basic playback working
2012-10-27 17:44:06 +02:00
Daniel Collin
8a0024415e
WIP on fixing up TrackerView
2012-10-27 17:05:08 +02:00
Daniel Collin
d681e5bd20
Code for sending the keyframes over to the demo
2012-10-27 10:11:41 +02:00
Daniel Collin
5faf9d53fd
Now getting the track names sent from the demo to the editor (yah!)
2012-10-26 17:48:01 +02:00
Daniel Collin
7e0d246491
Can now connect with target.
...
Now connects with target and they acknowledge each other correct.
Disconnecting the demo the Editor still thinks there is a connection
2012-10-26 17:20:35 +02:00
Daniel Collin
abf48f4028
Added code for remote connection
2012-10-26 16:54:28 +02:00
Daniel Collin
ae0d0a0671
Added code for logging
2012-10-26 16:37:07 +02:00
Daniel Collin
20431090ea
Renamed ClientSocket to RemoteConnection
2012-10-26 16:17:49 +02:00
Daniel Collin
f27b90bf6b
Removed deprecated file
2012-10-25 22:48:27 +02:00
Daniel Collin
52fbdd93de
Moved tracker ui code to TrackView.c/h
2012-10-25 22:48:16 +02:00
Daniel Collin
c4cd4355d8
Separated away save/load of xml to separate file. Added 60 Hz
2012-10-25 21:51:21 +02:00
Daniel Collin
c15809ae52
Added the socket layer for talking with the target from the editor
2012-10-24 22:15:19 +02:00
Daniel Collin
7f4a5df823
Merge branch 'master' of https://github.com/emoon/rocket
...
Conflicts:
ogl_editor/src/Editor.h
test.rocket
2012-10-24 00:07:23 +02:00
Daniel Collin
dd0bc8b750
Now with some basic loading of the xml file
2012-10-24 00:06:03 +02:00
Daniel Collin
2e9b1e2bd9
Implemented parts of opening files from the menu
2012-10-23 22:14:17 +02:00
Daniel Collin
adc3b2b059
Current status
2012-10-23 10:36:02 +02:00
Daniel Collin
706db2684c
Moved over the hacky UI from the emgui example code
2012-10-22 20:53:46 +02:00
Daniel Collin
e8a6c21b97
New (squashed!) icon and proper name instead of "My Application"
2012-10-22 20:35:20 +02:00
Daniel Collin
36baa7e2fb
While a bit hacky now using emgui (which is just declared outside the root dir to make it simple)
2012-10-22 20:20:24 +02:00
Daniel Collin
804aad808d
Current state. Cleaning and fixing
2012-10-21 20:02:58 +02:00
Daniel Collin
c597471c1c
Added emgui as submodule
2012-10-21 09:19:15 +02:00
Daniel Collin
d71e580abe
Basic button press now works
2012-04-18 14:45:31 +02:00
Daniel Collin
c33f759c26
Added RocketGui_button
2012-04-18 14:19:10 +02:00
Daniel Collin
64e2a5bd47
Basic UI drawing working
2012-04-18 14:02:09 +02:00
Daniel Collin
37661c61a6
Renamed OpenGLRenderer to OpenGLBackend
2012-04-18 13:23:14 +02:00
Daniel Collin
4380b921d8
Added .gitignore
2012-04-18 12:58:38 +02:00
Daniel Collin
921e9c85df
Added start of ogl_editor and tundra files to build everything
2012-04-18 12:57:57 +02:00
Erik Faye-Lund
bdca635226
editor: save/load bookmarks
...
Beware of the hack: Loads track-tags from anywhere in the document
to retain backwards compatibility.
2012-04-16 19:05:02 +02:00
Erik Faye-Lund
c17de99f82
editor: change bookmark-browsing keys
...
Shift+PgUp/PgDn was a poor choice for bookmark-browsing keys, as
it's also useful for selecting sync-data for copy/paste.
Fix this by changing the hotkeys to Alt+PgUp/PgDn instead.
2012-04-16 19:05:01 +02:00
Erik Faye-Lund
b1d3320415
editor: fix border-case when finding prev bookmark
...
A typo made the finding of the previous bookmark when the current
row is located after the last bookmark to fail. Fix this by
replacing a call to std::set<int>::rend() with a call to
std::set<int>::rbegin().
2012-04-16 18:42:27 +02:00
Erik Faye-Lund
3f19324255
editor: support going to prev/next bookmark
2012-04-10 19:52:25 +02:00
Erik Faye-Lund
3a859b781e
editor: add visual row-bookmarks
2012-04-10 19:52:13 +02:00
Erik Faye-Lund
2e53f4da00
editor: static-ism
...
There's no reason not to mark these symbols as static; let's do so.
2012-04-10 18:38:19 +02:00
Erik Faye-Lund
fe0c5ebec2
editor: remove useless build-configs
2012-04-10 18:31:50 +02:00
Erik Faye-Lund
5b120b11f5
editor: const correctness
2012-04-10 18:31:48 +02:00
Erik Faye-Lund
96cc9e82a4
editor: do not ask for saving on new document
...
A new, unmodified document does not contain any interresting data,
let's not bother the user about saving before quitting in that
case.
fixup some code style while at it.
2012-04-10 18:31:46 +02:00
Erik Faye-Lund
b85a3bddcb
edior: use document-getter more consistently
2012-04-10 18:31:39 +02:00
Erik Faye-Lund
8f94efbc62
player: add suport for Win64 builds
...
To make sure it works, add support to the example while we're at
it. Also fix compilation warnings.
2012-03-01 14:27:55 +01:00
Erik Faye-Lund
65c5c62e89
Merge branch 'work/dot-rocket'
2011-04-18 22:14:38 +02:00
Erik Faye-Lund
3f7a4a7fca
dotrocket: add example
...
Create a rudimentary C# example using DX11 for rendering and XAudio2
for sound (through SlimDX). The player is hacky due to what seems to
be issues with either the implementation or documentation of XAudio2
and/or SlimDX' intergration of it.
2011-04-18 22:00:13 +02:00
Anders Knive Lassen
a5e224713a
contrib: add .net bindings
...
DotRocket is a C++/CLI assembly that binds the C-api to Managed
objects for .NET.
2011-04-16 13:47:31 +02:00
Erik Faye-Lund
d8081fd63c
editor: fix dialog return
...
return the status from EndDialog instead of a constant TRUE. This
is mostly about keeping the code "honest", it doesn't change
anything in reality.
Also fix up some code-style.
2011-04-05 10:01:45 +02:00
