Nicolay Korslund
|
2ec96ed7de
|
Merge branch 'master' of http://github.com/ardekantur/openmw
|
2010-07-07 09:53:13 +02:00 |
|
Nicolay Korslund
|
359f2903d7
|
Merged athile and zinnschlag
|
2010-07-07 09:46:11 +02:00 |
|
athile
|
a638c330ec
|
Add one more command server fix so it still works correctly on Windows and reeanble the command server by default.
|
2010-07-06 10:28:48 -07:00 |
|
Marc Zinnschlag
|
9d73718ec1
|
added GetSecondsPassed
|
2010-07-06 12:06:50 +02:00 |
|
Marc Zinnschlag
|
f5a70abd4b
|
added OnActivate
|
2010-07-06 12:05:48 +02:00 |
|
Marc Zinnschlag
|
b2731c5e26
|
fix uninitialised variables
|
2010-07-05 14:34:15 +02:00 |
|
Marc Zinnschlag
|
3df5d377f2
|
added xbox function
|
2010-07-05 13:15:49 +02:00 |
|
Marc Zinnschlag
|
34b824cb70
|
implemented GetDistance function
|
2010-07-05 12:30:45 +02:00 |
|
Marc Zinnschlag
|
cc0c21cf35
|
added function to retrieve a live cell ref via name
|
2010-07-05 12:09:04 +02:00 |
|
athile
|
5fe4313b95
|
Various Windows fixes to CMake, compile errors, and a few warnings. Also made the command server optional and disabled by default since it is not currently working correctly on Linux.
|
2010-07-04 20:17:10 -07:00 |
|
Ardekantur
|
ee6c933156
|
Merge branch 'master' of git://github.com/korslund/openmw
Conflicts:
CMakeLists.txt
apps/openmw/main.cpp
game/engine.cpp
|
2010-07-04 17:16:57 -04:00 |
|
Marc Zinnschlag
|
a61b2c39f0
|
added scriptrunning/startscript/stopscript; sorted out more case problems
|
2010-07-04 16:00:32 +02:00 |
|
Marc Zinnschlag
|
185f8bd56d
|
added random function; global variable fix
|
2010-07-04 13:59:29 +02:00 |
|
Marc Zinnschlag
|
df8f8a315c
|
added missing part of global variable implementation (storage and interpreter context)
|
2010-07-04 13:33:33 +02:00 |
|
Marc Zinnschlag
|
d57e67e722
|
added global variable handling to compiler context (not working yet because of case problems)
|
2010-07-04 12:55:55 +02:00 |
|
Marc Zinnschlag
|
f9c1548f80
|
added menumode script function; added global variable handling in compiler and interpreter (openmw context still ignores global variables)
|
2010-07-04 12:29:28 +02:00 |
|
Marc Zinnschlag
|
cdcc244fc5
|
automatically start start scripts at startup
|
2010-07-04 10:50:19 +02:00 |
|
Marc Zinnschlag
|
4482884eb5
|
implemented global script execution
|
2010-07-04 10:43:34 +02:00 |
|
Marc Zinnschlag
|
530caac39b
|
merged CompilerScriptContext into base class
|
2010-07-04 09:59:29 +02:00 |
|
Marc Zinnschlag
|
5174679864
|
another bug-fix and missing documentation added
|
2010-07-03 20:51:21 +02:00 |
|
Marc Zinnschlag
|
5d46fc869c
|
added missing sound script functionality; various script-related bug-fixes
|
2010-07-03 20:35:59 +02:00 |
|
Marc Zinnschlag
|
eeeb9b09f8
|
identify LiveCellRefs by ptr instead of render handle
|
2010-07-03 17:59:30 +02:00 |
|
Marc Zinnschlag
|
3fae68b403
|
added unifying LiveCellRef pointer class
|
2010-07-03 17:46:55 +02:00 |
|
Marc Zinnschlag
|
d51e6fb7c4
|
second part of refactoring
|
2010-07-03 15:41:20 +02:00 |
|
Marc Zinnschlag
|
f8cb4c2502
|
moved sound manager from world to engine (first step of another round of refactoring)
|
2010-07-03 15:17:02 +02:00 |
|
Marc Zinnschlag
|
c12752df4d
|
added sound manager skeleton and sound script functions
|
2010-07-03 15:04:00 +02:00 |
|
Marc Zinnschlag
|
f0c492ae22
|
added CellChanged script function
|
2010-07-03 12:12:13 +02:00 |
|
Marc Zinnschlag
|
474b412b47
|
implemented local script execution
|
2010-07-02 18:08:00 +02:00 |
|
Marc Zinnschlag
|
8e2732c60e
|
local scripts are now run every frame (running scripts itself is not implemented yet)
|
2010-07-02 17:30:26 +02:00 |
|
Marc Zinnschlag
|
076b01559f
|
added local script compiling
|
2010-07-02 17:21:27 +02:00 |
|
Marc Zinnschlag
|
2064c43d89
|
added script manager (doesn't do anything yet); local scriptes for active cells are passed on to the script manager
|
2010-07-02 16:18:25 +02:00 |
|
Marc Zinnschlag
|
a06b84ac86
|
added local variables to ref data
|
2010-07-02 14:31:29 +02:00 |
|
Marc Zinnschlag
|
5c91ba74b8
|
store ogre handle in ref data
|
2010-07-02 14:00:28 +02:00 |
|
Marc Zinnschlag
|
def0a773bd
|
replaced void * entry in cell store with a generic type
|
2010-07-02 13:48:48 +02:00 |
|
Marc Zinnschlag
|
c7f76f51fb
|
added --debug option and finally cleaned up the merge mess
|
2010-07-02 13:12:05 +02:00 |
|
Marc Zinnschlag
|
417df63302
|
partial fix for merge problems
|
2010-07-02 12:30:30 +02:00 |
|
Nicolay Korslund
|
4a3f6b0ff1
|
Various fixes to get openmw to compile and run properly
|
2010-07-02 10:41:39 +02:00 |
|
Nicolay Korslund
|
0de4bb9d6c
|
Merged athile's work
|
2010-07-02 10:11:05 +02:00 |
|
Marc Zinnschlag
|
f8a1a0ab8c
|
improved cell handling; added world.* files (should have been added a few commits ago)
|
2010-07-02 09:38:22 +02:00 |
|
Marc Zinnschlag
|
ea6d342a24
|
split CellRender into CellRender and CellRenderImp
|
2010-07-02 09:25:55 +02:00 |
|
Marc Zinnschlag
|
ce37666dbc
|
factored world class out of main engine class
|
2010-07-02 09:00:06 +02:00 |
|
athile
|
7cc27d9b66
|
Add command output string and client/server response.
|
2010-07-01 15:50:24 -07:00 |
|
athile
|
7357ea2102
|
Add simple external console server/client
|
2010-07-01 11:49:00 -07:00 |
|
athile
|
de7087caf4
|
Move prepareMaster logic into addMaster. Having these separate only introduces the possibility for a bug.
|
2010-06-30 11:32:40 -07:00 |
|
athile
|
59a2e8dcf7
|
Merge upstream
|
2010-06-28 12:44:55 -07:00 |
|
athile
|
819c146ad1
|
Project clean-up: move 'misc' into the platform lib, update CMake to build 'platform' as a lib, and various fixes for Visual Studio compiler warnings
|
2010-06-27 18:05:01 -07:00 |
|
athile
|
82bbc69453
|
Only push the far clip plane out if the sky is enabled
|
2010-06-27 17:28:49 -07:00 |
|
athile
|
7db274f1c5
|
Sky rendering clean-up and correct resource configuration
|
2010-06-27 16:44:15 -07:00 |
|
athile
|
d67f0c74b0
|
Merge remote branch 'upstream/master'
|
2010-06-27 14:10:46 -07:00 |
|
Marc Zinnschlag
|
e4f85cb3e6
|
directory structure reorganisation (still missing the mangle stuff)
|
2010-06-25 22:28:59 +02:00 |
|