1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-29 06:45:32 +00:00
Commit graph

628 commits

Author SHA1 Message Date
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
gugus
0fb2107265 Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions
Conflicts:
	apps/openmw/mwclass/npc.cpp
2011-03-15 13:36:25 +01:00
Marc Zinnschlag
4100a72e8d don't do physics calculations while the GUI is up 2011-03-13 22:39:44 +01:00
Marc Zinnschlag
f1bfca7c7c player class cleanup 2011-03-13 22:37:54 +01:00
Marc Zinnschlag
eb93ef68f1 fixed collision mode interface and redirected collision mode script instruction from Player class to MWScene class 2011-03-13 22:33:55 +01:00
Jan-Peter Nilsson
0f2152903e Get rid of deprecated warning for eventWindowChangeCoord 2011-03-12 13:54:00 +01:00
Jan-Peter Nilsson
f83c5327f3 Move eventDone to WindowBase and make it tell which window is done 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
54fc64cb6a Decrease number of classes that need to know about other components 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
67b4243a7f Use one instead of five state variables to keep track of character creation progress 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
183ccad872 Move ClassPoint struct definition from source to header file 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
53b85eaaa9 Stat setValue, use the enum values all the way through instead of converting enum->string->same enum 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
0695e8d8b2 Move HUD implementation out of the header file 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
2a53afc2bf Move StatsWindow class to it's own file. 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
5342bd77f1 Use one event with a parameters instead of four events to tell with dialog we want to see 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
a0ee11c51b Don't care about the widget 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
03158f4b62 Change indentation to four spaces 2011-03-12 10:56:10 +01:00
Nikolay Kasyanov
edcac879d7 Oops. Used tabs instead of 4 spaces. Fixed. 2011-03-12 03:00:42 +03:00
Marc Zinnschlag
a14db99aa8 Merge remote branch 'gus/collisions' into collision 2011-03-11 22:09:01 +01:00
gugus
9b606be4b8 fix direction bug 2011-03-11 19:39:45 +01:00
Marc Zinnschlag
8ed1c59059 Merge remote branch 'jpn/collision' into collision 2011-03-09 19:31:18 +01:00
gugus
00de2e6d98 correct some stuff with the physic implementation 2011-03-09 19:09:11 +01:00
gugus
40193253b0 fix some time bug 2011-03-09 18:29:57 +01:00
Nikolay Kasyanov
768c9bdf07 On OS X openmw now sets current directory to bundle root, openmw.cfg values is relative to bundle root 2011-03-09 01:42:04 +03:00
Nikolay Kasyanov
943eea8104 .app bundle finally works 2011-03-08 22:27:57 +03:00
Nikolay Kasyanov
3d75eea377 Merge remote-tracking branch 'upstream/master' 2011-03-08 19:03:20 +03:00
Jan-Peter Nilsson
12db15d9a2 Reset arm position changed by commit 27f69d0f5b 2011-03-07 19:13:24 +01:00
Jan-Peter Nilsson
d68141d203 Remove unused variables 2011-03-07 19:13:24 +01:00
Jan-Peter Nilsson
6840e2c42f Fix mising of signed/unsigned types in WindowManager::showClassQuestionDialog 2011-03-07 19:13:24 +01:00
Nikolay Kasyanov
4028600768 Builds on OS X now 2011-03-07 05:09:29 +03:00
Jan-Peter Nilsson
fb2f6f3c02 Delete mPhysicEngine when we are done with it 2011-02-27 13:37:17 +01:00
Jan-Peter Nilsson
1ce77229c0 Don't create physics before we have initialized ogre 2011-02-27 00:50:08 +01:00
Marc Zinnschlag
1e9dc4b435 de-Windownizing and some build-fixes 2011-02-26 16:37:47 +01:00
gugus
33f22fd68b fix camera bug 2011-02-23 12:28:13 +01:00
gugus
903f39cb50 change the rayCasting system. It use bullet now. NOT TESTED! 2011-02-22 20:52:05 +01:00
gugus
d3c1640723 add physic support 2011-02-22 14:11:53 +01:00
gugus
7386fd0442 solve error with min/max macro for windows 2011-02-19 19:21:32 +01:00
gugus
84dce2eb36 add physic and solve a problem with window.h macro min/max 2011-02-19 19:18:03 +01:00
gugus
ff941b5963 add physic 2011-02-19 17:59:40 +01:00
sergoz
53ac8776ec added box for fps counter and changed font colour to white 2011-02-19 18:55:58 +03:00
gugus
ee0d73e142 Merge branch 'bullet' of git://github.com/zinnschlag/openmw.git into collisions 2011-02-19 15:54:00 +01:00
gugus
746cf3a45a add physic. 2011-02-19 11:36:57 +01:00
sergoz
5132531f73 added fps counter 2011-02-18 17:46:24 +03:00
Marc Zinnschlag
ef7a06dea5 player was not registered at mwscene (for physics) 2011-02-11 09:51:11 +01:00
Marc Zinnschlag
9807e7dadc simplified actor-related physics interface to mwscene 2011-02-11 09:24:59 +01:00
Marc Zinnschlag
5c1aae3e26 added object movement code in mwscene (will be replaced by physics code later); does not work well, because OpenEngine manipulates camera instead of player node 2011-02-10 13:32:34 +01:00
Marc Zinnschlag
9c6bc4975c attached camera to a scene node 2011-02-10 12:56:19 +01:00
Marc Zinnschlag
151560b882 added missing run flag for NPCs 2011-02-10 11:08:25 +01:00
Marc Zinnschlag
9a3158675a reworked cell changing mechanism 2011-02-10 10:38:45 +01:00
Marc Zinnschlag
f773cf27cb replaced old movement input system 2011-02-03 12:16:59 +01:00
Marc Zinnschlag
3cd1088695 crash bug fix 2011-02-03 12:16:20 +01:00
Marc Zinnschlag
65232008a5 fixed a crash bug in NPC rendering 2011-02-03 11:47:42 +01:00
Marc Zinnschlag
8a3445beec collect movement vectors from all actors 2011-02-03 11:43:29 +01:00
Marc Zinnschlag
4468a2b6a8 added movement data to MW references; added movement interface to MWWorld::Class 2011-02-03 11:37:17 +01:00
Marc Zinnschlag
ca44b3640a pasing movement data from mwmechanics to mwscene and fixed a very stupid interface bug 2011-02-01 10:11:41 +01:00
Marc Zinnschlag
7449de22b1 removed a leftover debugging breadcrumb 2011-01-30 13:21:54 +01:00
Marc Zinnschlag
8b2252e7a1 first attempt at building with bullet 2011-01-30 13:19:41 +01:00
Marc Zinnschlag
40d772b33a call doPhysics function once per frame 2011-01-29 17:39:34 +01:00
Marc Zinnschlag
88b0908104 adding physics when insertering objects into the OGRE scene 2011-01-29 17:33:48 +01:00
Marc Zinnschlag
6a14ea8ec3 handle physics during player changing cells 2011-01-29 16:57:33 +01:00
Marc Zinnschlag
5486c70edf connected object-manipulator functions in world to physics interface 2011-01-27 09:46:54 +01:00
Marc Zinnschlag
9a5a6eac2b stop reporting changes originating from physics system back to physics system 2011-01-27 09:29:55 +01:00
Marc Zinnschlag
ec88aee581 added a missing function 2011-01-25 18:12:13 +01:00
Marc Zinnschlag
843a0288c3 added more physics interface to MWScene 2011-01-25 17:56:49 +01:00
Marc Zinnschlag
162db31a5f physics interface 2011-01-23 15:28:42 +01:00
Marc Zinnschlag
36cb10572a fixed tab problem 2011-01-18 15:20:36 +01:00
Marc Zinnschlag
eb5e4427c1 Merge remote branch 'star/master' into movement 2011-01-18 15:15:00 +01:00
Star-Demon
588e6e9995 Fixed a syntax error! Oops! 2011-01-18 08:36:42 -05:00
Marc Zinnschlag
b48a5084be added NPC stances 2011-01-18 10:45:29 +01:00
Star-Demon
09023bb853 Toggle now toggles, conventions... 2011-01-18 00:16:01 -05:00
Star-Demon
962b8c9781 Cleaned up inputmanager, tightened up player.exectueAutoMove() 2011-01-17 16:36:44 -05:00
Star-Demon
1bc9a46c6b Cleaned up and changed executeAutoMove() 2011-01-17 15:48:12 -05:00
Marc Zinnschlag
18b8cdce29 added GetInterior script function 2011-01-17 10:18:12 +01:00
Star-Demon
90e6029bad Fixed object reference error in player gets 2011-01-16 13:45:54 -05:00
Star-Demon
81c0909dbf Player constructor now inits new variables. 2011-01-16 12:39:54 -05:00
Star-Demon
1a56ef9a67 More AutoMove, now including walking - ready for a look and then test 2011-01-16 11:05:03 -05:00
Star-Demon
5aec3815fd The player should now be able to run AND walk... 2011-01-16 10:47:03 -05:00
Star-Demon
f96f53484c More AutoMove stuff, Sneak bools, cleaning 2011-01-16 10:25:33 -05:00
Jan-Peter Nilsson
a724de2429 Follow the 'XDG Base Directory Specification' instead of putting the configfile in ~/.openmw/
Also updated based on feedback from athile:
Fix broken Linux elif.
Use boost:filesystem instead of mkdir for increased future portability.
Break appart class definition and implementation.
2011-01-14 22:51:47 +01:00
Star-Demon
60c9c31c7a Silly error Fixed in binding 2011-01-14 10:03:45 -05:00
Star-Demon
bfcfcecab6 Most of AutoMove finished - just needs some speed in Player class. 2011-01-14 09:52:28 -05:00
Marc Zinnschlag
d865c3cfc6 backend for tab completion: identifiers 2011-01-12 18:48:37 +01:00
Marc Zinnschlag
6848115c18 backend for tab completion: keywords 2011-01-12 18:24:00 +01:00
Star-Demon
3ab4a4487f Sneak State, Bound Sneak and AutoMove, began outlining AutoMove 2011-01-12 12:19:33 -05:00
Star-Demon
d4dccc0b54 Merge remote branch 'zinnschlag/master' 2011-01-12 12:19:25 -05:00
Jan-Peter Nilsson
851385d989 Allow override of OpenMW user configuration path with OPENMW_HOME environment variable 2011-01-12 18:18:06 +01:00
Jan-Peter Nilsson
8cb8481b37 Use a local plugins.cfg if available (allow us to run without installing) 2011-01-12 18:18:06 +01:00
Jan-Peter Nilsson
4221824681 Build debian package using cpack if dpkg is available
Derive version from last tag and get name and email for package maintainer from user's git config if .git is available
2011-01-12 18:18:06 +01:00
Jan-Peter Nilsson
0b1f18cc12 plugins.cfg is global config 2011-01-12 18:18:06 +01:00
Jan-Peter Nilsson
429775d485 Store configuration in /etc/openmw/ and ~/.openmw/ on linux
Requires new openengine version.
2011-01-12 18:18:06 +01:00