Java-Gaming.org    
Featured games (79)
games approved by the League of Dukes
Games in Showcase (475)
Games in Android Showcase (106)
games submitted by our members
Games in WIP (530)
games currently in development
News: Read the Java Gaming Resources, or peek at the official Java tutorials
 
    Home     Help   Search   Login   Register   
Pages: 1 ... 16 17 [18]
  ignore  |  Print  
  Go on, ask me anything.  (Read 65553 times)
0 Members and 1 Guest are viewing this topic.
Offline ra4king

JGO Kernel


Medals: 336
Projects: 2
Exp: 5 years


I'm the King!


« Reply #510 - Posted 2012-08-15 22:52:18 »

You can't push if there are conflicts, it will give you an error. What you do is pull, merge locally, then push the merged commit. That's why the best flow of work is *pull* before you push anything.

Offline Spasi
« Reply #511 - Posted 2012-08-15 22:53:33 »

The nice thing with git is that it won't let you push anything if there have been any changes since you last pulled. If that's the case, the person that wanted to push needs to pull first, resolve any conflicts that occurred locally, then try to push again. Quick article that explains it nicely after a random google search: http://yehudakatz.com/2010/05/13/common-git-workflows/

You'll also find that git handles merging better than SVN and you don't get as many trivial conflicts.
Offline jezek2
« Reply #512 - Posted 2012-08-15 23:50:40 »

Or you can use DVCS that is sane, like Monotone or probably Mercurial (not that pretty as Monotone, but similar basics).
Games published by our own members! Check 'em out!
Legends of Yore - The Casual Retro Roguelike
Offline Eli Delventhal

JGO Kernel


Medals: 42
Projects: 11


Game Engineer


« Reply #513 - Posted 2012-08-16 02:24:07 »

1  
2  
3  
4  
5  
git add .
git commit -m "My stuff!"
git pull
---sort out any conflicts
git push


Alternatively if you don't want to commit just yet:
1  
2  
3  
4  
git stash
git pull
git stash pop
---sort out any conflicts

See my work:
OTC Software
Offline ags1

JGO Ninja


Medals: 46
Projects: 2
Exp: 5 years


Make code not war!


« Reply #514 - Posted 2012-08-18 13:31:35 »

Cas, would you agree with the coding practice at my work: "If you don't need it right now, don't do it." So don't write any code you think might be useful in the future. Adding in unnecessary 'good ideas' just introduces bugs, bloats the code and adds effort to simple tasks.

I often think of this guideline when I see people say they are 'working on the engine for their first game' - just work on the game, get the code right for the game, and reuse the good bits in your next game.

Offline delt0r

JGO Knight


Medals: 26
Exp: 18 years


Computers can do that?


« Reply #515 - Posted 2012-08-18 14:04:59 »

Don't write engines, write games.

Also the scale of games we indies folk can realistically produce, means "cut and paste and hack" to the next project is probably going to good enough anyway.

Even big studios should do this... how many times to they really reuse the engine? In fact they almost always have the tag line "all new engine..." in their marketing speak.

I have no special talents. I am only passionately curious.--Albert Einstein
Offline Orangy Tang

JGO Kernel


Medals: 56
Projects: 11


Monkey for a head


« Reply #516 - Posted 2012-08-18 15:17:50 »

In fact they almost always have the tag line "all new engine..." in their marketing speak.

That's almost always marketing bullcrap though, because they think by saying that players will assume it's bigger and shinier than the previous game. Usually it just means the same engine with a new coat of paint. Skyrim being an obvious recent example.

[ TriangularPixels.com - Play Growth Spurt, Rescue Squad and Snowman Village ] [ Rebirth - game resource library ]
Offline i30817

Junior Member





« Reply #517 - Posted 2012-08-18 20:16:43 »

Or you can use DVCS that is sane, like Monotone or probably Mercurial (not that pretty as Monotone, but similar basics).
I don't regret using mercurial ... except for the versionied tags
Offline princec

JGO Kernel


Medals: 339
Projects: 3
Exp: 16 years


Eh? Who? What? ... Me?


« Reply #518 - Posted 2012-08-19 00:07:29 »

I wrote stuff in the beginning to achieve what we needed to achieve, no more, no less. However, being a software engineer of many decades, I have a strange instinct for things that things might one day need to do and how to put things together in a way that doesn't make it so hard to change later. Coupled with this strange instinct is a totally fearless bite-the-bullet-and-just-fecking-do-it attitude to refactoring, re-engineering and rebuilding things. If we needed to make a change to the sprite engine for Revenge of the Titans that broke the other three game using it, we made that change, and then went and fixed everything that broke.

Having now got to the point where we have four games relying on the library of code we've developed over 10 years it's pretty hard now to justify doing that, so I've forked the lot, refactored it, took a fork of Titan Attacks, and I'm making this new version of Titan Attacks work properly with it by way of being an awesome real-world system test.

Along the way I've added every single new feature that Chaz has asked for. Nice Smiley

SPGL2 as it is know makes a mockery of all other 2D game engines, or so I think, anyway Wink Well, it does exactly the job we need it to, and that's good.

Cas Smiley

Online Cero
« Reply #519 - Posted 2012-08-19 01:10:24 »

I would like to see the source code of Alien Flux... :D

Quote
ALIEN FLUX™ - Ground Breaking Arcade Game By PUPPY GAMES™ Goes Live
...
Alien Flux is being heralded as a flagship for Java gaming

http://forums.codeguru.com/showthread.php?249875-ALIEN-FLUX%99-Ground-Breaking-Arcade-Game-By-PUPPY-GAMES%99-Goes-Live

I bet you thought that code was good :3

Games published by our own members! Check 'em out!
Legends of Yore - The Casual Retro Roguelike
Offline appel

JGO Wizard


Medals: 50
Projects: 4


I always win!


« Reply #520 - Posted 2012-08-19 01:25:18 »


SPGL2 as it is know makes a mockery of all other 2D game engines, or so I think, anyway Wink Well, it does exactly the job we need it to, and that's good.

Cas Smiley

Strangely, this is what I get when goggling SPGL2:

<a href="http://www.youtube.com/v/cJlYIlu1aaM?version=3&amp;hl=en_US&amp;start=" target="_blank">http://www.youtube.com/v/cJlYIlu1aaM?version=3&amp;hl=en_US&amp;start=</a>
http://www.youtube.com/watch?feature=player_detailpage&v=cJlYIlu1aaM

Check out the 4K competition @ www.java4k.com
Check out GAMADU (my own site) @ http://gamadu.com/
Pages: 1 ... 16 17 [18]
  ignore  |  Print  
 
 
You cannot reply to this message, because it is very, very old.

 

Add your game by posting it in the WIP section,
or publish it in Showcase.

The first screenshot will be displayed as a thumbnail.

Riven (4 views)
2014-07-23 21:16:32

Riven (6 views)
2014-07-23 21:07:15

Riven (6 views)
2014-07-23 20:56:16

ctomni231 (40 views)
2014-07-18 06:55:21

Zero Volt (36 views)
2014-07-17 23:47:54

danieldean (30 views)
2014-07-17 23:41:23

MustardPeter (32 views)
2014-07-16 23:30:00

Cero (47 views)
2014-07-16 00:42:17

Riven (48 views)
2014-07-14 18:02:53

OpenGLShaders (38 views)
2014-07-14 16:23:47
HotSpot Options
by dleskov
2014-07-08 03:59:08

Java and Game Development Tutorials
by SwordsMiner
2014-06-14 00:58:24

Java and Game Development Tutorials
by SwordsMiner
2014-06-14 00:47:22

How do I start Java Game Development?
by ra4king
2014-05-17 11:13:37

HotSpot Options
by Roquen
2014-05-15 09:59:54

HotSpot Options
by Roquen
2014-05-06 15:03:10

Escape Analysis
by Roquen
2014-04-29 22:16:43

Experimental Toys
by Roquen
2014-04-28 13:24:22
java-gaming.org is not responsible for the content posted by its members, including references to external websites, and other references that may or may not have a relation with our primarily gaming and game production oriented community. inquiries and complaints can be sent via email to the info‑account of the company managing the website of java‑gaming.org
Powered by MySQL Powered by PHP Powered by SMF 1.1.18 | SMF © 2013, Simple Machines | Managed by Enhanced Four Valid XHTML 1.0! Valid CSS!