Marc Zinnschlag
|
e3d05e90d4
|
Merge remote branch 'swick/MessageBox' into MessageBox
|
2011-06-16 14:11:53 +02:00 |
|
Sebastian Wick
|
b72e9d3b2b
|
non-interactive MessageBox is finished. Didn't find any bugs.
|
2011-06-16 13:02:49 +02:00 |
|
Sebastian Wick
|
4d1db13c8f
|
MessageBoxmangerTimer is now working properly
|
2011-06-16 12:12:50 +02:00 |
|
Sebastian Wick
|
a4217f8fb8
|
Everything should work fine but deleting the existing MessageBox'es.
|
2011-06-15 22:53:05 +02:00 |
|
Marc Zinnschlag
|
bc92b7b1fa
|
Merge branch 'directories' into next
Conflicts:
components/files/multidircollection.hpp
components/nifogre/ogre_nif_loader.hpp
|
2011-06-15 22:40:24 +02:00 |
|
Marc Zinnschlag
|
0f2df4e2b8
|
more cleanup
|
2011-06-15 22:33:31 +02:00 |
|
Sebastian Wick
|
94e010b790
|
delete all non-interactive MessageBox'es when creating an interactive MessageBox
|
2011-06-15 19:53:32 +02:00 |
|
Sebastian Wick
|
6dc35247da
|
Word wrap for MessageBox
|
2011-06-15 19:42:20 +02:00 |
|
Jason Hooks
|
56affd018a
|
Some cleanup
|
2011-06-15 13:09:47 -04:00 |
|
Sebastian Wick
|
9c56031ee2
|
rudimental implementation of non-interactive MessageBox
|
2011-06-15 13:58:57 +02:00 |
|
Sebastian Wick
|
fc25ccef4e
|
MW_Dialog set ro right propertys
|
2011-06-14 22:11:36 +02:00 |
|
Sebastian Wick
|
56dc9ffcf3
|
now, realy deleted needless code.
|
2011-06-14 18:29:55 +02:00 |
|
Sebastian Wick
|
84c19a90ad
|
deleted needless code
|
2011-06-14 18:29:20 +02:00 |
|
Sebastian Wick
|
5bf5bde946
|
created new files, conncted MessageBoxManger with WindowManager
|
2011-06-14 16:41:30 +02:00 |
|
Jason Hooks
|
2fe66319fe
|
streammusic strict
|
2011-06-12 16:36:18 -04:00 |
|
Jason Hooks
|
9eefee7168
|
Say strict
|
2011-06-11 20:01:21 -04:00 |
|
Jason Hooks
|
93f41e25a4
|
fs-strict
|
2011-06-08 17:29:28 -04:00 |
|
Jason Hooks
|
65cc0e8317
|
trying strict
|
2011-06-08 17:15:13 -04:00 |
|
Jason Hooks
|
3a9007849d
|
Windows fix
|
2011-06-08 00:35:30 -04:00 |
|
Jason Hooks
|
4d31ca2c86
|
Leading slashes now work, efficiency changes
|
2011-06-07 17:17:25 -04:00 |
|
Jason Hooks
|
45453fd7a9
|
Case insensitive external loader working
|
2011-06-06 20:11:23 -04:00 |
|
Jason Hooks
|
f2a0fa8af2
|
Adding files to directory map
|
2011-06-05 23:46:18 -04:00 |
|
Jason Hooks
|
2aaa0f4578
|
Backslash working in linux
|
2011-06-04 01:29:57 -04:00 |
|
Jason
|
b92955763a
|
Introducing Dir Archive
|
2011-06-03 20:28:47 -04:00 |
|
Marc Zinnschlag
|
7d2956329a
|
some cleanup
|
2011-05-30 14:27:04 +02:00 |
|
Marc Zinnschlag
|
bed45a936e
|
fixed cell change crash
|
2011-05-30 14:21:55 +02:00 |
|
Jason Hooks
|
51b74c2f05
|
starting
|
2011-05-23 19:01:36 -04:00 |
|
Jason Hooks
|
b945ce61a5
|
Merge remote branch 'upstream/master'
|
2011-05-23 15:01:47 -04:00 |
|
gugus
|
c7fb27e801
|
Clean up wasn't done properly when deleting a Cell.
|
2011-05-23 20:22:12 +02:00 |
|
gugus
|
faaa08d6d0
|
removed this stupide methode to generate unique ID.
|
2011-05-23 19:47:27 +02:00 |
|
gugus
|
4546ca3863
|
static Objects goes inside the static geometry
|
2011-05-23 19:39:10 +02:00 |
|
gugus
|
cd79df1d8b
|
Merge branch 'static' of git@github.com:zinnschlag/openmw.git into optimisation
Conflicts:
apps/openmw/mwrender/exterior.cpp
|
2011-05-23 19:27:40 +02:00 |
|
Marc Zinnschlag
|
7192bc4f89
|
added static flag
|
2011-05-23 19:12:28 +02:00 |
|
gugus
|
41d283a3aa
|
very experimental: static geometry.
|
2011-05-23 15:00:01 +02:00 |
|
Marc Zinnschlag
|
64d6ee26bd
|
changed OGRE framelistener function from frameStarted to frameRenderingQueued
|
2011-05-18 16:37:09 +02:00 |
|
Marc Zinnschlag
|
80691250ec
|
don't create a new virtual machine for each script and frame
|
2011-05-18 16:01:19 +02:00 |
|
Marc Zinnschlag
|
8829398bfc
|
added --fs-strict switch
|
2011-05-05 19:56:16 +02:00 |
|
Marc Zinnschlag
|
ef1e986a87
|
added --data-local switch
|
2011-05-05 19:50:28 +02:00 |
|
Marc Zinnschlag
|
e60f0e3b38
|
--data switch accepts multiple directories now
|
2011-05-05 19:39:11 +02:00 |
|
Marc Zinnschlag
|
6e880cffb2
|
changed engine class to support multiple data directories for esm files
|
2011-05-05 19:32:42 +02:00 |
|
Marc Zinnschlag
|
5b6ec405e3
|
Merge branch 'script'
|
2011-04-28 10:30:32 +02:00 |
|
Marc Zinnschlag
|
58cbdfd762
|
Merge branch 'journal'
|
2011-04-28 10:27:18 +02:00 |
|
Marc Zinnschlag
|
8b9ee30924
|
user/global mixup
|
2011-04-28 10:15:04 +02:00 |
|
Marc Zinnschlag
|
bdfd28f44d
|
adjusted components/files namespace; some related cleanup
|
2011-04-28 09:56:50 +02:00 |
|
Marc Zinnschlag
|
7131c08ca4
|
moved path.hpp/path.cpp to a new component
|
2011-04-28 09:39:40 +02:00 |
|
Marc Zinnschlag
|
125319c441
|
splitting off console output from messageBox channel
|
2011-04-26 21:48:13 +02:00 |
|
Marc Zinnschlag
|
f52e6bd5ef
|
made toggle-type script instructions more verbose
|
2011-04-26 21:38:21 +02:00 |
|
Marc Zinnschlag
|
e18dde4571
|
added topic tracking
|
2011-04-26 20:48:36 +02:00 |
|
Marc Zinnschlag
|
7a1b215b6a
|
splitting of topic class from quest class
|
2011-04-26 20:39:59 +02:00 |
|
Marc Zinnschlag
|
3406d2fa89
|
removed redundant data from quest class
|
2011-04-26 20:22:50 +02:00 |
|
Marc Zinnschlag
|
944291d34f
|
added quest tracking to the journal
|
2011-04-26 20:08:37 +02:00 |
|
Marc Zinnschlag
|
fc2d659925
|
Merge remote branch 'jpn/config' into config
|
2011-04-24 12:20:38 +02:00 |
|
Marc Zinnschlag
|
65e43c448a
|
splitted StampedJournalEntry class off from JournalEntry
|
2011-04-22 11:16:39 +02:00 |
|
Marc Zinnschlag
|
f4f12e885f
|
all program options (except help) can now be used from a cfg file
|
2011-04-21 18:23:46 +02:00 |
|
Marc Zinnschlag
|
8915e8a751
|
change in multi_es branch broke fps switch; fixed now
|
2011-04-21 18:10:35 +02:00 |
|
Marc Zinnschlag
|
9ea99a46ee
|
Merge branch 'multi_es'
|
2011-04-21 18:07:32 +02:00 |
|
Marc Zinnschlag
|
f3fecdc627
|
quest entries are added to main journal now
|
2011-04-21 11:05:49 +02:00 |
|
Marc Zinnschlag
|
792de880cf
|
another constness fix
|
2011-04-21 11:00:00 +02:00 |
|
Marc Zinnschlag
|
717b5e1784
|
fixed a constness problem
|
2011-04-21 10:49:45 +02:00 |
|
Marc Zinnschlag
|
23464e4035
|
added interface and container for main journal
|
2011-04-19 11:02:22 +02:00 |
|
Marc Zinnschlag
|
5851e0a28c
|
added journal entry struct
|
2011-04-19 10:54:11 +02:00 |
|
Jason Hooks
|
92509d3b70
|
Trying to animate creatures
|
2011-04-13 20:35:44 -04:00 |
|
Jason Hooks
|
2ac1cc8aee
|
Trying to animate creatures
|
2011-04-13 20:16:46 -04:00 |
|
Jan-Peter Nilsson
|
f2faa34bd9
|
If there is an openmw.cfg in the current path, use it as global config
|
2011-04-09 11:31:06 +02:00 |
|
Marc Zinnschlag
|
53e0e38862
|
added missing TCL instruction
|
2011-04-06 09:49:00 +02:00 |
|
Marc Zinnschlag
|
f321e549a4
|
added instruction GetPCCell
|
2011-04-04 15:10:37 +02:00 |
|
Marc Zinnschlag
|
e4a0702bb4
|
added journal-related script instructions
|
2011-04-04 14:49:26 +02:00 |
|
Marc Zinnschlag
|
b40117449a
|
added journal script interface
|
2011-04-04 11:23:15 +02:00 |
|
Marc Zinnschlag
|
190f77f6c9
|
added journal class
|
2011-04-04 11:16:56 +02:00 |
|
Jan-Peter Nilsson
|
dc4e6216c3
|
Initialize member variables in the same order they are defined to avoid compiler warning
|
2011-04-03 13:20:42 +02:00 |
|
Jan-Peter Nilsson
|
a94de76801
|
Whitespace changes only tabs->spaces and removal of traling space (including mangle and openengline)
|
2011-04-03 13:20:42 +02:00 |
|
Jan-Peter Nilsson
|
2e2d490c78
|
Remove unused variable (compiler warning)
|
2011-04-03 13:20:18 +02:00 |
|
Marc Zinnschlag
|
beb1422c77
|
allow multiple --master and --plugin command line arguments
|
2011-03-29 13:57:56 +02:00 |
|
Pieter van der Kloet
|
833a61dd82
|
Fixed Boost errors with 1.46 caused by the deprecated name file_string()
|
2011-03-28 17:36:05 +02:00 |
|
Marc Zinnschlag
|
53e1d0e7e7
|
more cleanup
|
2011-03-23 23:05:15 +01:00 |
|
Marc Zinnschlag
|
a70e582ae2
|
removed debugging leftovers from the tab_complition branch
|
2011-03-23 23:03:41 +01:00 |
|
Marc Zinnschlag
|
c571148bef
|
Merge branch 'collision'
|
2011-03-23 22:57:56 +01:00 |
|
Marc Zinnschlag
|
5661dc27c2
|
removed a leftover from physics debugging
|
2011-03-23 22:56:58 +01:00 |
|
gugus
|
3ad2b9986e
|
fix actors not beeing deleted. Need the latest OEngine.
|
2011-03-23 19:16:51 +01:00 |
|
Marc Zinnschlag
|
d7226fc9c2
|
Merge branch 'tab_completion'
|
2011-03-23 17:08:52 +01:00 |
|
Marc Zinnschlag
|
7144657cfc
|
Merge branch 'script'
|
2011-03-23 17:07:05 +01:00 |
|
gugus
|
773b7635a4
|
decrease the range of the raycast, and modifie the gravity/speed of the player.
|
2011-03-22 21:30:46 +01:00 |
|
Marc Zinnschlag
|
0866e4d4fe
|
fix: NPCs were not added to physics system
|
2011-03-22 20:31:33 +01:00 |
|
Marc Zinnschlag
|
9946bb36f7
|
Merge remote branch 'gus/collision' into collision
|
2011-03-22 20:20:49 +01:00 |
|
gugus
|
7a28c9f3aa
|
fix the door bug
|
2011-03-22 20:15:19 +01:00 |
|
Marc Zinnschlag
|
7653caea27
|
Merge branch 'master' into collision
Conflicts:
apps/openmw/mwclass/npc.cpp
|
2011-03-22 20:02:03 +01:00 |
|
gugus
|
0cc94c81d4
|
Merge remote branch 'upstream/collision' into collision
|
2011-03-22 14:14:56 +01:00 |
|
Marc Zinnschlag
|
7b5d24c853
|
fixed a bug in phyiscs update code
|
2011-03-22 13:48:31 +01:00 |
|
gugus
|
3dddcbd958
|
fix a camera problem and increase player speed
|
2011-03-22 13:01:23 +01:00 |
|
Marc Zinnschlag
|
91ea36509d
|
gus' fly mode fix; manually applied
|
2011-03-21 14:08:56 +01:00 |
|
Marc Zinnschlag
|
8788dcebcf
|
Merge remote branch 'gus/collisions' into collision
|
2011-03-20 22:38:42 +01:00 |
|
gugus
|
8aeefd2af8
|
fix the fall bug when using ToggleCollision. Require lastest change with OEngine.
|
2011-03-20 21:52:31 +01:00 |
|
Marc Zinnschlag
|
647e88003e
|
build and activation fix
|
2011-03-19 19:54:37 +01:00 |
|
gugus
|
21c224af25
|
add gravity change to the ToggleCollisionMode function.
|
2011-03-18 13:32:42 +01:00 |
|
gugus
|
102f1ee5dc
|
filled the toggleCollisionMode function. It needs the lastest change in OEngine
|
2011-03-18 13:23:26 +01:00 |
|
gugus
|
2aee958789
|
Not sure about this commit: the PhysicEngine was initialized twice...
|
2011-03-18 13:22:51 +01:00 |
|
Marc Zinnschlag
|
72ce493123
|
non-unique NPC ID workaround
|
2011-03-18 10:20:14 +01:00 |
|
gugus
|
98b27813b7
|
change raycasting
|
2011-03-17 10:54:38 +01:00 |
|
Marc Zinnschlag
|
72a84356e2
|
added tcg/tcb instructions (toggle collision rendering); not fully working yet (problem in OpenEngine or MWScene)
|
2011-03-16 09:09:45 +01:00 |
|
Marc Zinnschlag
|
8ebdd77772
|
Merge branch 'collision' into script
|
2011-03-16 08:48:13 +01:00 |
|