ubergames/rpg-x2
0
0
Fork 0
mirror of https://github.com/UberGames/RPG-X2.git synced 2024-11-15 17:31:38 +00:00
Code Issues Projects Releases Packages Wiki Activity
131 commits 1 branch 0 tags 16 MiB
Commit graph

131 commits

This branch
This branch
All branches
Author SHA1 Message Date
Harry Young
964c631d8b Modified Makefile 
Added an Installpath and Parameter for my purposes
removed allclean as that can be done with 'make clean all'
 2011-12-13 13:38:36 +01:00
Walter Julius Hennecke
1236ad50b4 func_stasis_door 
Worked on func_stasis_door ... as it is now it'll crash the game :P
 2011-12-13 13:05:06 +01:00
Walter Julius Hennecke
d0c367a557 func_stasis_door 
Trigger problem resolved. Stil not done with the game side logic.
 2011-12-13 10:38:49 +01:00
Walter Julius Hennecke
09559579cc func_stasis_door 
Found my errors.
There still is a problem with the trigger though.
 2011-12-13 10:31:19 +01:00
Walter Julius Hennecke
daf1201460 Forgot to adjust version 2011-12-13 10:20:22 +01:00
Walter Julius Hennecke
84b478230d More work on func_stasis_door 
It's not working like I want yet. Guess it's better to grab pan and paper
now and do a bit of thinking ...
 2011-12-13 10:19:01 +01:00
Walter Julius Hennecke
43bd3c87dc func_stasis_door 
- Fixed bug leading to crash
- Started to work door togling (just testing out a few things for now)
 2011-12-12 23:59:32 +01:00
Walter Julius Hennecke
f6b13eb6c4 Have rewritten the Makefile in head folder 
- invoke make with make or make all to compile all shared libraries
- invoke make clean to clean up
- invoke make allclean to clean up and then compile everything
- Setup RPGXDIR properly and you'll be able to use make install to install everything
 2011-12-12 22:52:16 +01:00
Harry Young
ac334633df Manual revert to make sure things are level here. 
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-12 21:52:43 +01:00
Harry Young
4d0d25d1ad Fixed different versionnumbers 2011-12-12 19:48:11 +01:00
Harry Young
c9372420c6 Merge branch 'master' of git://github.com/UberGames/RPG-X2.git 
Conflicts:
	game/bg_public.h
 2011-12-12 19:40:09 +01:00
Walter Julius Hennecke
836078764e Critical bugfix 
- Fixed a critical bug in g_spawn.c G_ParseField
 2011-12-12 19:34:23 +01:00
Walter Julius Hennecke
d3685e16d2 Critical and minor bugfixes 
- Fixed critical error in G_ParseField
- Made other minor bugfix

BIG ISSUES: RPG-X is now crashing to desktop without error when loading maps.
I have no clue whats the problem ...
 2011-12-12 18:30:56 +01:00
Walter Julius Hennecke
cf63b37933 Updated version macro 2011-12-12 17:56:22 +01:00
Walter Julius Hennecke
b940920c32 Merge branch 'master' of https://github.com/UberGames/RPG-X2 2011-12-12 17:47:03 +01:00
Walter Julius Hennecke
4f7dc8a382 Removed an unused rpgxEF only var from entitystate_s 2011-12-12 17:46:18 +01:00
Harry Young
5721a7820a Readded cooking_steam and added toggle-functionality to fire, particlefire and electricfire 
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-12 13:27:05 +01:00
Harry Young
de20d8ba89 *Reintegrated the schimmery thing and prepped for some other fx. 
--There's a warning (other that '/*') in cgame that I dont know how to resolve
*added floder maps for mapping resources
-- first in is a map for testing all the fx in all their functionality (fxtest)
 2011-12-12 00:36:04 +01:00
Harry Young
f8b8a8179d Fixed crash when trying to kickvote an invalid client 
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-10 22:10:31 +01:00
Harry Young
0d1033212e Minor glitch but this one is verified to work ^^ (I simply trashed and reloaded everything to get it running again) 
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-10 20:30:19 +01:00
Harry Young
6354e2ee50 had an idea about map_restart, don't know if this works tough... 
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-10 20:11:40 +01:00
Harry Young
7125194664 Removals were my mistake. Tought they were redundant with game-lib and mover-lib whereas they actually are not. 
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-10 13:08:03 +01:00
Walter Julius Hennecke
db4eedafe1 Did some more work on func_stasis_door 2011-12-10 00:42:24 +01:00
Walter Julius Hennecke
166aa1db94 Have rewritten the spawn function of func_stasis_door. 
Changed the complete setup so areaportal states can be adjusted now.
This entity still needs a lot of work but we are on a good way now.
You don't mind if I work a bit more on this entity do you Harry?
 2011-12-10 00:03:03 +01:00
Harry Young
43d044fe4f Finished the update as good as I could. 
Removed something from entity that is already in game.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-09 15:52:19 +01:00
Harry Young
aee590c176 Added/Updated Lua-descriptions for mover and cinematic (guesstimate) 
will do the rest once I'm back home.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-09 10:41:49 +01:00
Harry Young
77f9f9e147 Added/Updated Lua-descriptions (some are guesstimates, tbc) 
Minor fix in g_spawn.c

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-09 01:58:06 +01:00
Walter Julius Hennecke
65f4ec4f0f A minor fix for func_stasis_door 2011-12-08 19:51:35 +01:00
Walter Julius Hennecke
046c6a4e8e Critical bugfixes ... 
- Fixed errors preventing any map from beeing loaded
- Fix for func_stasis_door ... so they don't crash the game anymore when loading maps containing them.
 2011-12-08 19:30:38 +01:00
Walter Julius Hennecke
c9624b4ff5 Added more functions to lua_refent 2011-12-08 13:51:43 +01:00
Walter Julius Hennecke
8441147b55 . 2011-12-07 12:56:34 +01:00
Walter Julius Hennecke
613bc7a1c3 . 2011-12-07 12:50:10 +01:00
Walter Julius Hennecke
25e0ba4d64 Added lua library for refentities (not finished yet) 2011-12-07 12:47:40 +01:00
Walter Julius Hennecke
e47dd4b792 . 2011-12-07 12:10:26 +01:00
Harry Young
a6f1b5dac5 added table of contents-feature to pdf using “JPDFbookmarks“ 
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-07 01:14:21 +01:00
Harry Young
3fd27395e8 Defined FX_AddLine3 and other minor things 
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-07 00:12:33 +01:00
Walter Julius Hennecke
268f6dcc74 Some cgame lua things 2011-12-06 14:15:21 +01:00
Walter Julius Hennecke
b45d86b603 Continued work on client lua support 2011-12-06 00:36:06 +01:00
Walter Julius Hennecke
0c24562b07 Fixed a bug in g_main.c where an entity was passed to an function insetead of its entity number. 2011-12-06 00:13:56 +01:00
Harry Young
f69ff3a240 Begin of fx-conversion and a minor change to the laser turret 
Going to open an issue here.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-05 23:07:12 +01:00
Harry Young
5931f48e12 Removed FX_DetailLevel 
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-05 20:07:18 +01:00
Harry Young
0d3b6ad490 Merge branch 'master' of git://github.com/UberGames/RPG-X2.git 2011-12-05 19:47:50 +01:00
Harry Young
90125906cb Fixes for misc_laser. 
Still need float to transfer alpha-channel from game to cgame

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
 2011-12-05 19:47:42 +01:00
Walter Julius Hennecke
d3e0d7be93 forgot some more files lol 2011-12-05 19:22:14 +01:00
Walter Julius Hennecke
a25e243a03 started adding cgame lua support ... forgot to add two files 2011-12-05 19:20:02 +01:00
Walter Julius Hennecke
25f31e0255 started adding cgame lua support 2011-12-05 19:19:16 +01:00
Walter Julius Hennecke
252a52afdc ... 2011-12-05 17:44:24 +01:00
Walter Julius Hennecke
27c653a790 Merge branch 'master' of https://github.com/UberGames/RPG-X2 2011-12-05 17:22:08 +01:00
Walter Julius Hennecke
48b671fade cgame/Makefile update 2011-12-05 17:21:37 +01:00
Harry Young
61947264f6 Merge branch 'master' of git://github.com/UberGames/RPG-X2.git 2011-12-05 17:13:11 +01:00